Make some SDK project compile under Java 1.6

Change-Id: I97189bda85530decff2ef8c4da3c43f186a6dba0

36 files changed, 291 insertions, 6 deletions

diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
index 23dfbea..2e03f11 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/HierarchyViewerDirector.java
@@ -18,16 +18,16 @@ package com.android.hierarchyviewerlib;
 
 import com.android.ddmlib.AdbCommandRejectedException;
 import com.android.ddmlib.AndroidDebugBridge;
+import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
 import com.android.ddmlib.IDevice;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.RawImage;
 import com.android.ddmlib.TimeoutException;
-import com.android.ddmlib.AndroidDebugBridge.IDeviceChangeListener;
 import com.android.hierarchyviewerlib.device.DeviceBridge;
+import com.android.hierarchyviewerlib.device.DeviceBridge.ViewServerInfo;
 import com.android.hierarchyviewerlib.device.ViewNode;
 import com.android.hierarchyviewerlib.device.Window;
 import com.android.hierarchyviewerlib.device.WindowUpdater;
-import com.android.hierarchyviewerlib.device.DeviceBridge.ViewServerInfo;
 import com.android.hierarchyviewerlib.device.WindowUpdater.IWindowChangeListener;
 import com.android.hierarchyviewerlib.models.DeviceSelectionModel;
 import com.android.hierarchyviewerlib.models.PixelPerfectModel;
@@ -129,8 +129,10 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public abstract void executeInBackground(String taskName, Runnable task);
 
+    @Override
     public void deviceConnected(final IDevice device) {
         executeInBackground("Connecting device", new Runnable() {
+            @Override
             public void run() {
                 if (DeviceSelectionModel.getModel().containsDevice(device)) {
                     windowsChanged(device);
@@ -174,8 +176,10 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     }
 
+    @Override
     public void deviceDisconnected(final IDevice device) {
         executeInBackground("Disconnecting device", new Runnable() {
+            @Override
             public void run() {
                 ViewServerInfo viewServerInfo = DeviceBridge.getViewServerInfo(device);
                 if (viewServerInfo != null && viewServerInfo.protocolVersion >= 3) {
@@ -196,14 +200,17 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         });
     }
 
+    @Override
     public void deviceChanged(IDevice device, int changeMask) {
         if ((changeMask & IDevice.CHANGE_STATE) != 0 && device.isOnline()) {
             deviceConnected(device);
         }
     }
 
+    @Override
     public void windowsChanged(final IDevice device) {
         executeInBackground("Refreshing windows", new Runnable() {
+            @Override
             public void run() {
                 if (!DeviceBridge.isViewServerRunning(device)) {
                     if (!DeviceBridge.startViewServer(device)) {
@@ -217,8 +224,10 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         });
     }
 
+    @Override
     public void focusChanged(final IDevice device) {
         executeInBackground("Updating focus", new Runnable() {
+            @Override
             public void run() {
                 int focusedWindow = DeviceBridge.getFocusedWindow(device);
                 DeviceSelectionModel.getModel().updateFocusedWindow(device, focusedWindow);
@@ -242,6 +251,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
             }
             if (proceed) {
                 executeInBackground("Refreshing pixel perfect screenshot", new Runnable() {
+                    @Override
                     public void run() {
                         Image screenshotImage = getScreenshotImage(device);
                         if (screenshotImage != null) {
@@ -261,6 +271,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         final IDevice device = PixelPerfectModel.getModel().getDevice();
         if (device != null) {
             executeInBackground("Refreshing pixel perfect tree", new Runnable() {
+                @Override
                 public void run() {
                     ViewNode viewNode =
                             DeviceBridge.loadWindowData(Window.getFocusedWindow(device));
@@ -275,6 +286,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void loadPixelPerfectData(final IDevice device) {
         executeInBackground("Loading pixel perfect data", new Runnable() {
+            @Override
             public void run() {
                 Image screenshotImage = getScreenshotImage(device);
                 if (screenshotImage != null) {
@@ -299,6 +311,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
             }
             final ImageContainer imageContainer = new ImageContainer();
             Display.getDefault().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     ImageData imageData =
                             new ImageData(screenshot.width, screenshot.height, screenshot.bpp,
@@ -321,6 +334,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void loadViewTreeData(final Window window) {
         executeInBackground("Loading view hierarchy", new Runnable() {
+            @Override
             public void run() {
 
                 mFilterText = ""; //$NON-NLS-1$
@@ -337,6 +351,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void loadOverlay(final Shell shell) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 FileDialog fileDialog = new FileDialog(shell, SWT.OPEN);
                 fileDialog.setFilterExtensions(new String[] {
@@ -361,11 +376,13 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void showCapture(final Shell shell, final ViewNode viewNode) {
         executeInBackground("Capturing node", new Runnable() {
+            @Override
             public void run() {
                 final Image image = loadCapture(viewNode);
                 if (image != null) {
 
                     Display.getDefault().syncExec(new Runnable() {
+                        @Override
                         public void run() {
                             CaptureDisplay.show(shell, viewNode, image);
                         }
@@ -388,6 +405,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void loadCaptureInBackground(final ViewNode viewNode) {
         executeInBackground("Capturing node", new Runnable() {
+            @Override
             public void run() {
                 loadCapture(viewNode);
             }
@@ -403,6 +421,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void refreshWindows() {
         executeInBackground("Refreshing windows", new Runnable() {
+            @Override
             public void run() {
                 IDevice[] devicesA = DeviceSelectionModel.getModel().getDevices();
                 IDevice[] devicesB = DeviceBridge.getDevices();
@@ -441,6 +460,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void saveTreeView(final Shell shell) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 final DrawableViewNode viewNode = TreeViewModel.getModel().getTree();
                 if (viewNode != null) {
@@ -455,6 +475,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
                     final String fileName = fileDialog.open();
                     if (fileName != null) {
                         executeInBackground("Saving tree view", new Runnable() {
+                            @Override
                             public void run() {
                                 Image image = TreeView.paintToImage(viewNode);
                                 ImageLoader imageLoader = new ImageLoader();
@@ -482,6 +503,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void savePixelPerfect(final Shell shell) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 Image untouchableImage = PixelPerfectModel.getModel().getImage();
                 if (untouchableImage != null) {
@@ -497,6 +519,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
                     final String fileName = fileDialog.open();
                     if (fileName != null) {
                         executeInBackground("Saving pixel perfect", new Runnable() {
+                            @Override
                             public void run() {
                                 ImageLoader imageLoader = new ImageLoader();
                                 imageLoader.data = new ImageData[] {
@@ -522,6 +545,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void capturePSD(final Shell shell) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 final Window window = TreeViewModel.getModel().getWindow();
                 if (window != null) {
@@ -536,6 +560,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
                     final String fileName = fileDialog.open();
                     if (fileName != null) {
                         executeInBackground("Saving window layers", new Runnable() {
+                            @Override
                             public void run() {
                                 PsdFile psdFile = DeviceBridge.captureLayers(window);
                                 if (psdFile != null) {
@@ -568,6 +593,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         final DrawableViewNode selectedNode = TreeViewModel.getModel().getSelection();
         if (selectedNode != null) {
             executeInBackground("Invalidating view", new Runnable() {
+                @Override
                 public void run() {
                     DeviceBridge.invalidateView(selectedNode.viewNode);
                 }
@@ -579,6 +605,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         final DrawableViewNode selectedNode = TreeViewModel.getModel().getSelection();
         if (selectedNode != null) {
             executeInBackground("Request layout", new Runnable() {
+                @Override
                 public void run() {
                     DeviceBridge.requestLayout(selectedNode.viewNode);
                 }
@@ -590,6 +617,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
         final DrawableViewNode selectedNode = TreeViewModel.getModel().getSelection();
         if (selectedNode != null) {
             executeInBackground("Dump displaylist", new Runnable() {
+                @Override
                 public void run() {
                     DeviceBridge.outputDisplayList(selectedNode.viewNode);
                 }
@@ -599,6 +627,7 @@ public abstract class HierarchyViewerDirector implements IDeviceChangeListener,
 
     public void loadAllViews() {
         executeInBackground("Loading all views", new Runnable() {
+            @Override
             public void run() {
                 DrawableViewNode tree = TreeViewModel.getModel().getTree();
                 if (tree != null) {
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 b62ba7e..f1f7ad6 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/CapturePSDAction.java
@@ -55,6 +55,7 @@ public class CapturePSDAction extends TreeViewEnabledAction implements ImageActi
         HierarchyViewerDirector.getDirector().capturePSD(mShell);
     }
 
+    @Override
     public Image getImage() {
         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 e637216..7da02d7 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DisplayViewAction.java
@@ -55,6 +55,7 @@ public class DisplayViewAction extends SelectedNodeEnabledAction implements Imag
         HierarchyViewerDirector.getDirector().showCapture(mShell);
     }
 
+    @Override
     public Image getImage() {
         return mImage;
     }
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DumpDisplayListAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DumpDisplayListAction.java
index 8b9ba29..fdbc7ef 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DumpDisplayListAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/DumpDisplayListAction.java
@@ -20,7 +20,6 @@ import com.android.ddmuilib.ImageLoader;
 import com.android.hierarchyviewerlib.HierarchyViewerDirector;
 
 import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Image;
 import org.eclipse.swt.widgets.Display;
 
@@ -50,6 +49,7 @@ public class DumpDisplayListAction extends SelectedNodeEnabledAction implements
         HierarchyViewerDirector.getDirector().dumpDisplayListForCurrentNode();
     }
 
+    @Override
     public Image getImage() {
         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 72280f9..708c7b1 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InspectScreenshotAction.java
@@ -59,28 +59,35 @@ public class InspectScreenshotAction extends Action implements ImageAction, IWin
         HierarchyViewerDirector.getDirector().inspectScreenshot();
     }
 
+    @Override
     public Image getImage() {
         return mImage;
     }
 
+    @Override
     public void deviceChanged(IDevice device) {
         // pass
     }
 
+    @Override
     public void deviceConnected(IDevice device) {
         // pass
     }
 
+    @Override
     public void deviceDisconnected(IDevice device) {
         // pass
     }
 
+    @Override
     public void focusChanged(IDevice device) {
         // pass
     }
 
+    @Override
     public void selectionChanged(final IDevice device, final Window window) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 InspectScreenshotAction.getAction().setEnabled(device != null);
             }
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 83da0ce..b884220 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/InvalidateAction.java
@@ -51,6 +51,7 @@ public class InvalidateAction extends SelectedNodeEnabledAction implements Image
         HierarchyViewerDirector.getDirector().invalidateCurrentNode();
     }
 
+    @Override
     public Image getImage() {
         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 81c1b02..1876358 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadOverlayAction.java
@@ -55,6 +55,7 @@ public class LoadOverlayAction extends PixelPerfectEnabledAction implements Imag
         HierarchyViewerDirector.getDirector().loadOverlay(mShell);
     }
 
+    @Override
     public Image getImage() {
         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 9629716..f2dbaee 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/LoadViewHierarchyAction.java
@@ -59,28 +59,35 @@ public class LoadViewHierarchyAction extends Action implements ImageAction, IWin
         HierarchyViewerDirector.getDirector().loadViewHierarchy();
     }
 
+    @Override
     public Image getImage() {
         return mImage;
     }
 
+    @Override
     public void deviceChanged(IDevice device) {
         // pass
     }
 
+    @Override
     public void deviceConnected(IDevice device) {
         // pass
     }
 
+    @Override
     public void deviceDisconnected(IDevice device) {
         // pass
     }
 
+    @Override
     public void focusChanged(IDevice device) {
         // pass
     }
 
+    @Override
     public void selectionChanged(final IDevice device, final Window window) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 LoadViewHierarchyAction.getAction().setEnabled(window != null);
             }
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 e104b03..a47c143 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectAutoRefreshAction.java
@@ -52,6 +52,7 @@ public class PixelPerfectAutoRefreshAction extends PixelPerfectEnabledAction imp
         HierarchyViewerDirector.getDirector().setPixelPerfectAutoRefresh(sAction.isChecked());
     }
 
+    @Override
     public Image getImage() {
         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 b423d14..33cb343 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/PixelPerfectEnabledAction.java
@@ -35,38 +35,47 @@ public class PixelPerfectEnabledAction extends Action implements IImageChangeLis
         PixelPerfectModel.getModel().addImageChangeListener(this);
     }
 
+    @Override
     public void crosshairMoved() {
         // pass
     }
 
+    @Override
     public void imageChanged() {
-        // 
+        //
     }
 
+    @Override
     public void imageLoaded() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 setEnabled(PixelPerfectModel.getModel().getImage() != null);
             }
         });
     }
 
+    @Override
     public void overlayChanged() {
         // pass
     }
 
+    @Override
     public void overlayTransparencyChanged() {
         // pass
     }
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         // pass
     }
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 2e06bbd..54f53c8 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectAction.java
@@ -51,6 +51,7 @@ public class RefreshPixelPerfectAction extends PixelPerfectEnabledAction impleme
         HierarchyViewerDirector.getDirector().refreshPixelPerfect();
     }
 
+    @Override
     public Image getImage() {
         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 8c17760..e9d1c56 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshPixelPerfectTreeAction.java
@@ -51,6 +51,7 @@ public class RefreshPixelPerfectTreeAction extends PixelPerfectEnabledAction imp
         HierarchyViewerDirector.getDirector().refreshPixelPerfectTree();
     }
 
+    @Override
     public Image getImage() {
         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 8f15c1c..01c2527 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshViewAction.java
@@ -51,6 +51,7 @@ public class RefreshViewAction extends TreeViewEnabledAction implements ImageAct
         HierarchyViewerDirector.getDirector().reloadViewHierarchy();
     }
 
+    @Override
     public Image getImage() {
         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 6097ad3..561f4ea 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RefreshWindowsAction.java
@@ -52,6 +52,7 @@ public class RefreshWindowsAction extends Action implements ImageAction {
         HierarchyViewerDirector.getDirector().refreshWindows();
     }
 
+    @Override
     public Image getImage() {
         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 5a79933..6fc7867 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/RequestLayoutAction.java
@@ -51,6 +51,7 @@ public class RequestLayoutAction extends SelectedNodeEnabledAction implements Im
         HierarchyViewerDirector.getDirector().relayoutCurrentNode();
     }
 
+    @Override
     public Image getImage() {
         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 45d6da5..57e0094 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SavePixelPerfectAction.java
@@ -55,6 +55,7 @@ public class SavePixelPerfectAction extends PixelPerfectEnabledAction implements
         HierarchyViewerDirector.getDirector().savePixelPerfect(mShell);
     }
 
+    @Override
     public Image getImage() {
         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 69df7e0..9e11919 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SaveTreeViewAction.java
@@ -55,6 +55,7 @@ public class SaveTreeViewAction extends TreeViewEnabledAction implements ImageAc
         HierarchyViewerDirector.getDirector().saveTreeView(mShell);
     }
 
+    @Override
     public Image getImage() {
         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 f051f69..eee28b9 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/SelectedNodeEnabledAction.java
@@ -30,8 +30,10 @@ public class SelectedNodeEnabledAction extends Action implements ITreeChangeList
         TreeViewModel.getModel().addTreeChangeListener(this);
     }
 
+    @Override
     public void selectionChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 setEnabled(TreeViewModel.getModel().getTree() != null
                         && TreeViewModel.getModel().getSelection() != null);
@@ -39,8 +41,10 @@ public class SelectedNodeEnabledAction extends Action implements ITreeChangeList
         });
     }
 
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 setEnabled(TreeViewModel.getModel().getTree() != null
                         && TreeViewModel.getModel().getSelection() != null);
@@ -48,9 +52,11 @@ public class SelectedNodeEnabledAction extends Action implements ITreeChangeList
         });
     }
 
+    @Override
     public void viewportChanged() {
     }
 
+    @Override
     public void zoomChanged() {
     }
 }
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java
index 7354ed5..4b9c02c 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/actions/TreeViewEnabledAction.java
@@ -29,21 +29,26 @@ public class TreeViewEnabledAction extends Action implements ITreeChangeListener
         TreeViewModel.getModel().addTreeChangeListener(this);
     }
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 setEnabled(TreeViewModel.getModel().getTree() != null);
             }
         });
     }
 
+    @Override
     public void viewportChanged() {
     }
 
+    @Override
     public void zoomChanged() {
     }
 }
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
index 8a730bd..07bb807 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/DeviceBridge.java
@@ -288,6 +288,7 @@ public class DeviceBridge {
             }
         }
 
+        @Override
         public boolean isCancelled() {
             return false;
         }
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 d925404..76eaa10 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/ViewNode.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/ViewNode.java
@@ -178,6 +178,7 @@ public class ViewNode {
         } while (!stop);
 
         Collections.sort(properties, new Comparator<ViewNode.Property>() {
+            @Override
             public int compare(ViewNode.Property source, ViewNode.Property destination) {
                 return source.name.compareTo(destination.name);
             }
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 a0cc635..9dbb989 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/WindowUpdater.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/device/WindowUpdater.java
@@ -128,6 +128,7 @@ public class WindowUpdater {
             this.device = device;
         }
 
+        @Override
         public void run() {
             while (!Thread.currentThread().isInterrupted()) {
                 DeviceConnection connection = null;
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 004adb2..81331ed 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/models/PixelPerfectModel.java
@@ -67,6 +67,7 @@ public class PixelPerfectModel {
         final Image toDispose = this.mImage;
         final Image toDispose2 = this.mOverlayImage;
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (PixelPerfectModel.this) {
                     PixelPerfectModel.this.mDevice = device;
@@ -87,6 +88,7 @@ public class PixelPerfectModel {
         notifyImageLoaded();
         if (toDispose != null) {
             Display.getDefault().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     toDispose.dispose();
                 }
@@ -94,6 +96,7 @@ public class PixelPerfectModel {
         }
         if (toDispose2 != null) {
             Display.getDefault().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     toDispose2.dispose();
                 }
@@ -118,6 +121,7 @@ public class PixelPerfectModel {
 
     public void setTree(final ViewNode viewNode) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (PixelPerfectModel.this) {
                     PixelPerfectModel.this.mViewNode = viewNode;
@@ -131,6 +135,7 @@ public class PixelPerfectModel {
     public void setImage(final Image image) {
         final Image toDispose = this.mImage;
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (PixelPerfectModel.this) {
                     PixelPerfectModel.this.mImage = image;
@@ -140,6 +145,7 @@ public class PixelPerfectModel {
         notifyImageChanged();
         if (toDispose != null) {
             Display.getDefault().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     toDispose.dispose();
                 }
@@ -163,6 +169,7 @@ public class PixelPerfectModel {
     public void setOverlayImage(final Image overlayImage) {
         final Image toDispose = this.mOverlayImage;
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (PixelPerfectModel.this) {
                     PixelPerfectModel.this.mOverlayImage = overlayImage;
@@ -172,6 +179,7 @@ public class PixelPerfectModel {
         notifyOverlayChanged();
         if (toDispose != null) {
             Display.getDefault().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     toDispose.dispose();
                 }
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 6ff8125..fb277e8 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/CaptureDisplay.java
@@ -128,6 +128,7 @@ public class CaptureDisplay {
 
     private static PaintListener sPaintListener = new PaintListener() {
 
+        @Override
         public void paintControl(PaintEvent e) {
             if (sOnWhite.getSelection()) {
                 e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_WHITE));
@@ -176,10 +177,12 @@ public class CaptureDisplay {
     };
 
     private static SelectionListener sWhiteSelectionListener = new SelectionListener() {
+        @Override
         public void widgetDefaultSelected(SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             sOnWhite.setSelection(true);
             sOnBlack.setSelection(false);
@@ -188,10 +191,12 @@ public class CaptureDisplay {
     };
 
     private static SelectionListener sBlackSelectionListener = new SelectionListener() {
+        @Override
         public void widgetDefaultSelected(SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             sOnBlack.setSelection(true);
             sOnWhite.setSelection(false);
@@ -200,10 +205,12 @@ public class CaptureDisplay {
     };
 
     private static SelectionListener sExtrasSelectionListener = new SelectionListener() {
+        @Override
         public void widgetDefaultSelected(SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             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 4f2e17e..84841ef 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/DeviceSelector.java
@@ -67,6 +67,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
     private boolean mDoPixelPerfectStuff;
 
     private class ContentProvider implements ITreeContentProvider, ILabelProvider, IFontProvider {
+        @Override
         public Object[] getChildren(Object parentElement) {
             if (parentElement instanceof IDevice && mDoTreeViewStuff) {
                 Window[] list = mModel.getWindows((IDevice) parentElement);
@@ -77,6 +78,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return new Object[0];
         }
 
+        @Override
         public Object getParent(Object element) {
             if (element instanceof Window) {
                 return ((Window) element).getDevice();
@@ -84,6 +86,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return null;
         }
 
+        @Override
         public boolean hasChildren(Object element) {
             if (element instanceof IDevice && mDoTreeViewStuff) {
                 Window[] list = mModel.getWindows((IDevice) element);
@@ -94,6 +97,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return false;
         }
 
+        @Override
         public Object[] getElements(Object inputElement) {
             if (inputElement instanceof DeviceSelectionModel) {
                 return mModel.getDevices();
@@ -101,14 +105,17 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return new Object[0];
         }
 
+        @Override
         public void dispose() {
             // pass
         }
 
+        @Override
         public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
             // pass
         }
 
+        @Override
         public Image getImage(Object element) {
             if (element instanceof IDevice) {
                 if (((IDevice) element).isEmulator()) {
@@ -119,6 +126,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return null;
         }
 
+        @Override
         public String getText(Object element) {
             if (element instanceof IDevice) {
                 return ((IDevice) element).toString();
@@ -128,6 +136,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return null;
         }
 
+        @Override
         public Font getFont(Object element) {
             if (element instanceof Window) {
                 int focusedWindow = mModel.getFocusedWindow(((Window) element).getDevice());
@@ -138,15 +147,18 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             return null;
         }
 
+        @Override
         public void addListener(ILabelProviderListener listener) {
             // pass
         }
 
+        @Override
         public boolean isLabelProperty(Object element, String property) {
             // pass
             return false;
         }
 
+        @Override
         public void removeListener(ILabelProviderListener listener) {
             // pass
         }
@@ -202,6 +214,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeWindowChangeListener(DeviceSelector.this);
             mBoldFont.dispose();
@@ -238,6 +251,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
             this.mDoTreeViewStuff = doTreeViewStuff;
             this.mDoPixelPerfectStuff = doPixelPerfectStuff;
             Display.getDefault().syncExec(new Runnable() {
+                @Override
                 public void run() {
                     mTreeViewer.refresh();
                     if (expandAll) {
@@ -248,8 +262,10 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
         }
     }
 
+    @Override
     public void deviceConnected(final IDevice device) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 mTreeViewer.refresh();
                 mTreeViewer.setExpandedState(device, true);
@@ -257,8 +273,10 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
         });
     }
 
+    @Override
     public void deviceChanged(final IDevice device) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 TreeSelection selection = (TreeSelection) mTreeViewer.getSelection();
                 mTreeViewer.refresh(device);
@@ -270,16 +288,20 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
         });
     }
 
+    @Override
     public void deviceDisconnected(final IDevice device) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 mTreeViewer.refresh();
             }
         });
     }
 
+    @Override
     public void focusChanged(final IDevice device) {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 TreeSelection selection = (TreeSelection) mTreeViewer.getSelection();
                 mTreeViewer.refresh(device);
@@ -291,10 +313,12 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
         });
     }
 
+    @Override
     public void selectionChanged(IDevice device, Window window) {
         // pass
     }
 
+    @Override
     public void widgetDefaultSelected(SelectionEvent e) {
         Object selection = ((TreeItem) e.item).getData();
         if (selection instanceof IDevice && mDoPixelPerfectStuff) {
@@ -304,6 +328,7 @@ public class DeviceSelector extends Composite implements IWindowChangeListener,
         }
     }
 
+    @Override
     public void widgetSelected(SelectionEvent e) {
         Object selection = ((TreeItem) e.item).getData();
         if (selection instanceof IDevice) {
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 94c63aa..95c7a29 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/LayoutViewer.java
@@ -89,6 +89,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeTreeChangeListener(LayoutViewer.this);
             mTransform.dispose();
@@ -100,6 +101,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
     };
 
     private Listener mResizeListener = new Listener() {
+        @Override
         public void handleEvent(Event e) {
             synchronized (this) {
                 setTransform();
@@ -109,6 +111,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
 
     private MouseListener mMouseListener = new MouseListener() {
 
+        @Override
         public void mouseDoubleClick(MouseEvent e) {
             if (mSelectedNode != null) {
                 HierarchyViewerDirector.getDirector()
@@ -116,6 +119,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void mouseDown(MouseEvent e) {
             boolean selectionChanged = false;
             DrawableViewNode newSelection = null;
@@ -138,6 +142,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void mouseUp(MouseEvent e) {
             // pass
         }
@@ -176,6 +181,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
     }
 
     private PaintListener mPaintListener = new PaintListener() {
+        @Override
         public void paintControl(PaintEvent e) {
             synchronized (LayoutViewer.this) {
                 if (mOnBlack) {
@@ -286,6 +292,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
 
     private void doRedraw() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 redraw();
             }
@@ -317,6 +324,7 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
         }
     }
 
+    @Override
     public void selectionChanged() {
         synchronized (this) {
             if (mSelectedNode != null) {
@@ -331,8 +339,10 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
     }
 
     // Note the syncExec and then synchronized... It avoids deadlock
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     if (mSelectedNode != null) {
@@ -350,10 +360,12 @@ public class LayoutViewer extends Canvas implements ITreeChangeListener {
         doRedraw();
     }
 
+    @Override
     public void viewportChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         // pass
     }
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 90e19c6..533b840 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfect.java
@@ -91,6 +91,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeImageChangeListener(PixelPerfect.this);
             mCrosshairColor.dispose();
@@ -106,14 +107,17 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
 
     private MouseListener mMouseListener = new MouseListener() {
 
+        @Override
         public void mouseDoubleClick(MouseEvent e) {
             // pass
         }
 
+        @Override
         public void mouseDown(MouseEvent e) {
             handleMouseEvent(e);
         }
 
+        @Override
         public void mouseUp(MouseEvent e) {
             handleMouseEvent(e);
         }
@@ -121,6 +125,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
     };
 
     private MouseMoveListener mMouseMoveListener = new MouseMoveListener() {
+        @Override
         public void mouseMove(MouseEvent e) {
             if (e.stateMask != 0) {
                 handleMouseEvent(e);
@@ -147,6 +152,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
 
     private KeyListener mKeyListener = new KeyListener() {
 
+        @Override
         public void keyPressed(KeyEvent e) {
             boolean crosshairMoved = false;
             synchronized (PixelPerfect.this) {
@@ -184,6 +190,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
             }
         }
 
+        @Override
         public void keyReleased(KeyEvent e) {
             // pass
         }
@@ -191,6 +198,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
     };
 
     private PaintListener mPaintListener = new PaintListener() {
+        @Override
         public void paintControl(PaintEvent e) {
             synchronized (PixelPerfect.this) {
                 e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -281,6 +289,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
 
     private void doRedraw() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 mCanvas.redraw();
             }
@@ -299,8 +308,10 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
         setMinSize(mWidth, mHeight);
     }
 
+    @Override
     public void imageLoaded() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     loadImage();
@@ -314,8 +325,10 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
         doRedraw();
     }
 
+    @Override
     public void imageChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     loadImage();
@@ -325,6 +338,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
         doRedraw();
     }
 
+    @Override
     public void crosshairMoved() {
         synchronized (this) {
             mCrosshairLocation = mModel.getCrosshairLocation();
@@ -332,6 +346,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
         doRedraw();
     }
 
+    @Override
     public void selectionChanged() {
         synchronized (this) {
             mSelectedNode = mModel.getSelected();
@@ -340,8 +355,10 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
     }
 
     // Note the syncExec and then synchronized... It avoids deadlock
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mSelectedNode = mModel.getSelected();
@@ -351,10 +368,12 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
         doRedraw();
     }
 
+    @Override
     public void zoomChanged() {
         // pass
     }
 
+    @Override
     public void overlayChanged() {
         synchronized (this) {
             mOverlayImage = mModel.getOverlayImage();
@@ -363,6 +382,7 @@ public class PixelPerfect extends ScrolledComposite implements IImageChangeListe
         doRedraw();
     }
 
+    @Override
     public void overlayTransparencyChanged() {
         synchronized (this) {
             mOverlayTransparency = mModel.getOverlayTransparency();
diff --git a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java
index 3114d34..6054088 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectControls.java
@@ -164,6 +164,7 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             PixelPerfectModel.getModel().removeImageChangeListener(PixelPerfectControls.this);
         }
@@ -172,10 +173,12 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
     private SelectionListener overlaySliderSelectionListener = new SelectionListener() {
         private int oldValue;
 
+        @Override
         public void widgetDefaultSelected(SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             int newValue = mOverlaySlider.getSelection();
             if (oldValue != newValue) {
@@ -190,10 +193,12 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
     private SelectionListener mRefreshSliderSelectionListener = new SelectionListener() {
         private int oldValue;
 
-        public void widgetDefaultSelected(SelectionEvent e) {
+        @Override
+        public void widgetDefaultSelected(final SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             int newValue = mAutoRefreshSlider.getSelection();
             if (oldValue != newValue) {
@@ -205,10 +210,12 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
     private SelectionListener mZoomSliderSelectionListener = new SelectionListener() {
         private int oldValue;
 
+        @Override
         public void widgetDefaultSelected(SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             int newValue = mZoomSlider.getSelection();
             if (oldValue != newValue) {
@@ -220,20 +227,25 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
         }
     };
 
+    @Override
     public void crosshairMoved() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         // pass
     }
 
+    @Override
     public void imageChanged() {
         // pass
     }
 
+    @Override
     public void imageLoaded() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
                 mOverlaySlider.setEnabled(overlayImage != null);
@@ -245,8 +257,10 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
         });
     }
 
+    @Override
     public void overlayChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 Image overlayImage = PixelPerfectModel.getModel().getOverlayImage();
                 mOverlaySlider.setEnabled(overlayImage != null);
@@ -254,8 +268,10 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
         });
     }
 
+    @Override
     public void overlayTransparencyChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 mOverlaySlider.setSelection((int) (PixelPerfectModel.getModel()
                         .getOverlayTransparency() * 100));
@@ -263,12 +279,15 @@ public class PixelPerfectControls extends Composite implements IImageChangeListe
         });
     }
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 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 129dc4d..ac3d66e 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectLoupe.java
@@ -97,6 +97,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeImageChangeListener(PixelPerfectLoupe.this);
             mCrosshairColor.dispose();
@@ -109,14 +110,17 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
 
     private MouseListener mMouseListener = new MouseListener() {
 
+        @Override
         public void mouseDoubleClick(MouseEvent e) {
             // pass
         }
 
+        @Override
         public void mouseDown(MouseEvent e) {
             handleMouseEvent(e);
         }
 
+        @Override
         public void mouseUp(MouseEvent e) {
             //
         }
@@ -124,6 +128,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
     };
 
     private MouseWheelListener mMouseWheelListener = new MouseWheelListener() {
+        @Override
         public void mouseScrolled(MouseEvent e) {
             int newZoom = -1;
             synchronized (PixelPerfectLoupe.this) {
@@ -164,6 +169,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
 
     private KeyListener mKeyListener = new KeyListener() {
 
+        @Override
         public void keyPressed(KeyEvent e) {
             boolean crosshairMoved = false;
             synchronized (PixelPerfectLoupe.this) {
@@ -201,6 +207,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
             }
         }
 
+        @Override
         public void keyReleased(KeyEvent e) {
             // pass
         }
@@ -208,6 +215,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
     };
 
     private PaintListener mPaintListener = new PaintListener() {
+        @Override
         public void paintControl(PaintEvent e) {
             synchronized (PixelPerfectLoupe.this) {
                 e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -277,6 +285,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
 
     private void doRedraw() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 redraw();
             }
@@ -295,8 +304,10 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
     }
 
     // Note the syncExec and then synchronized... It avoids deadlock
+    @Override
     public void imageLoaded() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     loadImage();
@@ -310,8 +321,10 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
         doRedraw();
     }
 
+    @Override
     public void imageChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     loadImage();
@@ -321,6 +334,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
         doRedraw();
     }
 
+    @Override
     public void crosshairMoved() {
         synchronized (this) {
             mCrosshairLocation = mModel.getCrosshairLocation();
@@ -328,16 +342,20 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
         doRedraw();
     }
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     if (mGrid != null) {
@@ -354,6 +372,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
         doRedraw();
     }
 
+    @Override
     public void overlayChanged() {
         synchronized (this) {
             mOverlayImage = mModel.getOverlayImage();
@@ -362,6 +381,7 @@ public class PixelPerfectLoupe extends Canvas implements IImageChangeListener {
         doRedraw();
     }
 
+    @Override
     public void overlayTransparencyChanged() {
         synchronized (this) {
             mOverlayTransparency = mModel.getOverlayTransparency();
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 6680523..d1ff6d9 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectPixelPanel.java
@@ -64,12 +64,14 @@ public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListen
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeImageChangeListener(PixelPerfectPixelPanel.this);
         }
     };
 
     private PaintListener mPaintListener = new PaintListener() {
+        @Override
         public void paintControl(PaintEvent e) {
             synchronized (PixelPerfectPixelPanel.this) {
                 e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -138,12 +140,14 @@ public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListen
 
     private void doRedraw() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 redraw();
             }
         });
     }
 
+    @Override
     public void crosshairMoved() {
         synchronized (this) {
             mCrosshairLocation = mModel.getCrosshairLocation();
@@ -151,6 +155,7 @@ public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListen
         doRedraw();
     }
 
+    @Override
     public void imageChanged() {
         synchronized (this) {
             mImage = mModel.getImage();
@@ -158,6 +163,7 @@ public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListen
         doRedraw();
     }
 
+    @Override
     public void imageLoaded() {
         synchronized (this) {
             mImage = mModel.getImage();
@@ -167,6 +173,7 @@ public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListen
         doRedraw();
     }
 
+    @Override
     public void overlayChanged() {
         synchronized (this) {
             mOverlayImage = mModel.getOverlayImage();
@@ -174,18 +181,22 @@ public class PixelPerfectPixelPanel extends Canvas implements IImageChangeListen
         doRedraw();
     }
 
+    @Override
     public void overlayTransparencyChanged() {
         // pass
     }
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         // pass
     }
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 da7cd62..e9848d8 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PixelPerfectTree.java
@@ -53,6 +53,7 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
     private Image mFileImage;
 
     private class ContentProvider implements ITreeContentProvider, ILabelProvider {
+        @Override
         public Object[] getChildren(Object element) {
             if (element instanceof ViewNode) {
                 List<ViewNode> children = ((ViewNode) element).children;
@@ -61,6 +62,7 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
             return null;
         }
 
+        @Override
         public Object getParent(Object element) {
             if (element instanceof ViewNode) {
                 return ((ViewNode) element).parent;
@@ -68,6 +70,7 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
             return null;
         }
 
+        @Override
         public boolean hasChildren(Object element) {
             if (element instanceof ViewNode) {
                 return ((ViewNode) element).children.size() != 0;
@@ -75,6 +78,7 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
             return false;
         }
 
+        @Override
         public Object[] getElements(Object element) {
             if (element instanceof PixelPerfectModel) {
                 ViewNode viewNode = ((PixelPerfectModel) element).getViewNode();
@@ -88,14 +92,17 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
             return new Object[0];
         }
 
+        @Override
         public void dispose() {
             // pass
         }
 
+        @Override
         public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
             // pass
         }
 
+        @Override
         public Image getImage(Object element) {
             if (element instanceof ViewNode) {
                 if (hasChildren(element)) {
@@ -106,6 +113,7 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
             return null;
         }
 
+        @Override
         public String getText(Object element) {
             if (element instanceof ViewNode) {
                 return ((ViewNode) element).name;
@@ -113,15 +121,18 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
             return null;
         }
 
+        @Override
         public void addListener(ILabelProviderListener listener) {
             // pass
         }
 
+        @Override
         public boolean isLabelProperty(Object element, String property) {
             // pass
             return false;
         }
 
+        @Override
         public void removeListener(ILabelProviderListener listener) {
             // pass
         }
@@ -156,6 +167,7 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeImageChangeListener(PixelPerfectTree.this);
         }
@@ -166,8 +178,10 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
         return mTree.setFocus();
     }
 
+    @Override
     public void imageLoaded() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 mTreeViewer.refresh();
                 mTreeViewer.expandAll();
@@ -175,26 +189,32 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
         });
     }
 
+    @Override
     public void imageChanged() {
         // pass
     }
 
+    @Override
     public void crosshairMoved() {
         // pass
     }
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         imageLoaded();
     }
 
+    @Override
     public void widgetDefaultSelected(SelectionEvent e) {
         // pass
     }
 
+    @Override
     public void widgetSelected(SelectionEvent e) {
         // To combat phantom selection...
         if (((TreeSelection) mTreeViewer.getSelection()).isEmpty()) {
@@ -204,14 +224,17 @@ public class PixelPerfectTree extends Composite implements IImageChangeListener,
         }
     }
 
+    @Override
     public void zoomChanged() {
         // pass
     }
 
+    @Override
     public void overlayChanged() {
         // pass
     }
 
+    @Override
     public void overlayTransparencyChanged() {
         // pass
     }
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 4396a1f..a3722ec 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/PropertyViewer.java
@@ -58,6 +58,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
 
     private class ContentProvider implements ITreeContentProvider, ITableLabelProvider {
 
+        @Override
         public Object[] getChildren(Object parentElement) {
             synchronized (PropertyViewer.this) {
                 if (mSelectedNode != null && parentElement instanceof String) {
@@ -80,6 +81,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
             }
         }
 
+        @Override
         public Object getParent(Object element) {
             synchronized (PropertyViewer.this) {
                 if (mSelectedNode != null && element instanceof Property) {
@@ -97,6 +99,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
             }
         }
 
+        @Override
         public boolean hasChildren(Object element) {
             synchronized (PropertyViewer.this) {
                 if (mSelectedNode != null && element instanceof String) {
@@ -117,6 +120,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
             }
         }
 
+        @Override
         public Object[] getElements(Object inputElement) {
             synchronized (PropertyViewer.this) {
                 if (mSelectedNode != null && inputElement instanceof TreeViewModel) {
@@ -132,18 +136,22 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void dispose() {
             // pass
         }
 
+        @Override
         public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
             // pass
         }
 
+        @Override
         public Image getColumnImage(Object element, int column) {
             return null;
         }
 
+        @Override
         public String getColumnText(Object element, int column) {
             synchronized (PropertyViewer.this) {
                 if (mSelectedNode != null) {
@@ -167,15 +175,18 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void addListener(ILabelProviderListener listener) {
             // pass
         }
 
+        @Override
         public boolean isLabelProperty(Object element, String property) {
             // pass
             return false;
         }
 
+        @Override
         public void removeListener(ILabelProviderListener listener) {
             // pass
         }
@@ -226,6 +237,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeTreeChangeListener(PropertyViewer.this);
             mSmallFont.dispose();
@@ -259,6 +271,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
         }
     };
 
+    @Override
     public void selectionChanged() {
         synchronized (this) {
             mSelectedNode = mModel.getSelection();
@@ -266,6 +279,7 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
         doRefresh();
     }
 
+    @Override
     public void treeChanged() {
         synchronized (this) {
             mSelectedNode = mModel.getSelection();
@@ -273,16 +287,19 @@ public class PropertyViewer extends Composite implements ITreeChangeListener {
         doRefresh();
     }
 
+    @Override
     public void viewportChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         // pass
     }
 
     private void doRefresh() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 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 3b90629..9449ccc 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeView.java
@@ -185,6 +185,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeTreeChangeListener(TreeView.this);
             mTransform.dispose();
@@ -198,6 +199,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
     };
 
     private Listener mResizeListener = new Listener() {
+        @Override
         public void handleEvent(Event e) {
             synchronized (TreeView.this) {
                 if (mTree != null && mViewport != null) {
@@ -220,6 +222,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
 
     private KeyListener mKeyListener = new KeyListener() {
 
+        @Override
         public void keyPressed(KeyEvent e) {
             boolean selectionChanged = false;
             DrawableViewNode clickedNode = null;
@@ -318,12 +321,14 @@ public class TreeView extends Canvas implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void keyReleased(KeyEvent e) {
         }
     };
 
     private MouseListener mMouseListener = new MouseListener() {
 
+        @Override
         public void mouseDoubleClick(MouseEvent e) {
             DrawableViewNode clickedNode = null;
             synchronized (TreeView.this) {
@@ -338,6 +343,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void mouseDown(MouseEvent e) {
             boolean selectionChanged = false;
             synchronized (TreeView.this) {
@@ -391,6 +397,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void mouseUp(MouseEvent e) {
             boolean redraw = false;
             boolean redrawButton = false;
@@ -451,6 +458,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
     };
 
     private MouseMoveListener mMouseMoveListener = new MouseMoveListener() {
+        @Override
         public void mouseMove(MouseEvent e) {
             boolean redraw = false;
             boolean viewportChanged = false;
@@ -537,6 +545,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
     }
 
     private MouseWheelListener mMouseWheelListener = new MouseWheelListener() {
+        @Override
         public void mouseScrolled(MouseEvent e) {
             Point zoomPoint = null;
             synchronized (TreeView.this) {
@@ -552,6 +561,7 @@ public class TreeView extends Canvas implements ITreeChangeListener {
     };
 
     private PaintListener mPaintListener = new PaintListener() {
+        @Override
         public void paintControl(PaintEvent e) {
             synchronized (TreeView.this) {
                 e.gc.setBackground(Display.getDefault().getSystemColor(SWT.COLOR_BLACK));
@@ -966,15 +976,17 @@ public class TreeView extends Canvas implements ITreeChangeListener {
 
     private void doRedraw() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 redraw();
             }
         });
     }
-    
+
     public void loadAllData() {
         boolean newViewport = mViewport == null;
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mTree = mModel.getTree();
@@ -999,8 +1011,10 @@ public class TreeView extends Canvas implements ITreeChangeListener {
 
     // Fickle behaviour... When a new tree is loaded, the model doesn't know
     // about the viewport until it passes through here.
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mTree = mModel.getTree();
@@ -1038,8 +1052,10 @@ public class TreeView extends Canvas implements ITreeChangeListener {
     }
 
     // Note the syncExec and then synchronized... It avoids deadlock
+    @Override
     public void viewportChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mViewport = mModel.getViewport();
@@ -1051,10 +1067,12 @@ public class TreeView extends Canvas implements ITreeChangeListener {
         doRedraw();
     }
 
+    @Override
     public void zoomChanged() {
         viewportChanged();
     }
 
+    @Override
     public void selectionChanged() {
         synchronized (this) {
             mSelectedNode = mModel.getSelection();
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 5c794e4..fc03f13 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewControls.java
@@ -84,6 +84,7 @@ public class TreeViewControls extends Composite implements ITreeChangeListener {
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             TreeViewModel.getModel().removeTreeChangeListener(TreeViewControls.this);
         }
@@ -92,10 +93,12 @@ public class TreeViewControls extends Composite implements ITreeChangeListener {
     private SelectionListener mZoomSliderSelectionListener = new SelectionListener() {
         private int oldValue;
 
+        @Override
         public void widgetDefaultSelected(SelectionEvent e) {
             // pass
         }
 
+        @Override
         public void widgetSelected(SelectionEvent e) {
             int newValue = mZoomSlider.getSelection();
             if (oldValue != newValue) {
@@ -108,17 +111,21 @@ public class TreeViewControls extends Composite implements ITreeChangeListener {
     };
 
     private ModifyListener mFilterTextModifyListener = new ModifyListener() {
+        @Override
         public void modifyText(ModifyEvent e) {
             HierarchyViewerDirector.getDirector().filterNodes(mFilterText.getText());
         }
     };
 
+    @Override
     public void selectionChanged() {
         // pass
     }
 
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 if (TreeViewModel.getModel().getTree() != null) {
                     mZoomSlider.setSelection((int) Math
@@ -129,12 +136,15 @@ public class TreeViewControls extends Composite implements ITreeChangeListener {
         });
     }
 
+    @Override
     public void viewportChanged() {
         // pass
     }
 
+    @Override
     public void zoomChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 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 34167dd..bbff48c 100644
--- a/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java
+++ b/hierarchyviewer2/libs/hierarchyviewerlib/src/com/android/hierarchyviewerlib/ui/TreeViewOverview.java
@@ -99,6 +99,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
     }
 
     private DisposeListener mDisposeListener = new DisposeListener() {
+        @Override
         public void widgetDisposed(DisposeEvent e) {
             mModel.removeTreeChangeListener(TreeViewOverview.this);
             mTransform.dispose();
@@ -108,10 +109,12 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
 
     private MouseListener mMouseListener = new MouseListener() {
 
+        @Override
         public void mouseDoubleClick(MouseEvent e) {
             // pass
         }
 
+        @Override
         public void mouseDown(MouseEvent e) {
             boolean redraw = false;
             synchronized (TreeViewOverview.this) {
@@ -129,6 +132,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
             }
         }
 
+        @Override
         public void mouseUp(MouseEvent e) {
             boolean redraw = false;
             synchronized (TreeViewOverview.this) {
@@ -155,6 +159,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
     };
 
     private MouseMoveListener mMouseMoveListener = new MouseMoveListener() {
+        @Override
         public void mouseMove(MouseEvent e) {
             boolean moved = false;
             synchronized (TreeViewOverview.this) {
@@ -198,6 +203,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
     }
 
     private Listener mResizeListener = new Listener() {
+        @Override
         public void handleEvent(Event arg0) {
             synchronized (TreeViewOverview.this) {
                 setTransform();
@@ -207,6 +213,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
     };
 
     private PaintListener mPaintListener = new PaintListener() {
+        @Override
         public void paintControl(PaintEvent e) {
             synchronized (TreeViewOverview.this) {
                 if (mTree != null) {
@@ -274,6 +281,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
 
     private void doRedraw() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 redraw();
             }
@@ -282,6 +290,7 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
 
     public void loadAllData() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mTree = mModel.getTree();
@@ -295,8 +304,10 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
     }
 
     // Note the syncExec and then synchronized... It avoids deadlock
+    @Override
     public void treeChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mTree = mModel.getTree();
@@ -356,8 +367,10 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
         }
     }
 
+    @Override
     public void viewportChanged() {
         Display.getDefault().syncExec(new Runnable() {
+            @Override
             public void run() {
                 synchronized (this) {
                     mViewport = mModel.getViewport();
@@ -369,10 +382,12 @@ public class TreeViewOverview extends Canvas implements ITreeChangeListener {
         doRedraw();
     }
 
+    @Override
     public void zoomChanged() {
         viewportChanged();
     }
 
+    @Override
     public void selectionChanged() {
         synchronized (this) {
             mSelectedNode = mModel.getSelection();
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 e03394a..1213620 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
@@ -48,6 +48,7 @@ public class TreeColumnResizer {
     }
 
     private Listener resizeListener = new Listener() {
+        @Override
         public void handleEvent(Event e) {
             if (mColumn1Width == 0 && mColumn2Width == 0) {
                 mColumn1Width = (mControl.getBounds().width - 18) / 2;
@@ -83,6 +84,7 @@ public class TreeColumnResizer {
     };
 
     private Listener column1ResizeListener = new Listener() {
+        @Override
         public void handleEvent(Event e) {
             int widthDif = mColumn1Width - mColumn1.getWidth();
             mColumn1Width -= widthDif;