Fix Hierarchy viewer plug-in again.

Change-Id: I15ef8c3050826c7f17dc1ee822a3c8e268c62c36

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 959bf6c..978cfac 100644 (file)
--- 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
@@ -115,10 +115,7 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin {
         new Thread() {
             @Override
             public void run() {
-                if (director.acquireBridge()) {
-                    director.startListenForDevices();
-                    director.populateDeviceSelectionModel();
-                }
+                initDirector(director);
             }
         }.start();
     }
@@ -167,15 +164,23 @@ public class HierarchyViewerPlugin extends AbstractUIPlugin {
                 new Thread() {
                     @Override
                     public void run() {
-                        HierarchyViewerDirector.getDirector().initDebugBridge();
-                        HierarchyViewerDirector.getDirector().startListenForDevices();
-                        HierarchyViewerDirector.getDirector().populateDeviceSelectionModel();
+                        initDirector(HierarchyViewerDirector.getDirector());
                     }
                 }.start();
             }
         }
     }
 
+    private static boolean initDirector(HierarchyViewerDirector director) {
+        if (director.acquireBridge()) {
+            director.startListenForDevices();
+            director.populateDeviceSelectionModel();
+            return true;
+        }
+
+        return false;
+    }
+
     /**
      * Prints a message, associated with a project to the specified stream
      *