Update the ddmlib api for push/pull/install

The API now throws SyncException instead of returning SyncResult.

The IDevice API to install/uninstall now returns a single
InstallException that encapsulate all the other ddmlib
exception.

Also, the recently added exceptions now don't extend IOException
anymore.

Change-Id: Ib334c4157a6add1882233dfaaa032aea1910eede

3 files changed, 23 insertions, 0 deletions

diff --git a/hierarchyviewer/src/com/android/hierarchyviewer/device/DeviceBridge.java b/hierarchyviewer/src/com/android/hierarchyviewer/device/DeviceBridge.java
index 209577d..2d2cea1 100644
--- a/hierarchyviewer/src/com/android/hierarchyviewer/device/DeviceBridge.java
+++ b/hierarchyviewer/src/com/android/hierarchyviewer/device/DeviceBridge.java
@@ -21,6 +21,7 @@ import com.android.ddmlib.AndroidDebugBridge;
 import com.android.ddmlib.IDevice;
 import com.android.ddmlib.Log;
 import com.android.ddmlib.MultiLineReceiver;
+import com.android.ddmlib.ShellCommandUnresponsiveException;
 import com.android.ddmlib.TimeoutException;
 
 import java.io.IOException;
@@ -73,6 +74,12 @@ public class DeviceBridge {
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (TimeoutException e) {
+            e.printStackTrace();
+        } catch (AdbCommandRejectedException e) {
+            e.printStackTrace();
+        } catch (ShellCommandUnresponsiveException e) {
+            e.printStackTrace();
         }
         return result[0];
     }
@@ -91,6 +98,12 @@ public class DeviceBridge {
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (TimeoutException e) {
+            e.printStackTrace();
+        } catch (AdbCommandRejectedException e) {
+            e.printStackTrace();
+        } catch (ShellCommandUnresponsiveException e) {
+            e.printStackTrace();
         }
         return result[0];
     }
@@ -105,6 +118,12 @@ public class DeviceBridge {
             }
         } catch (IOException e) {
             e.printStackTrace();
+        } catch (TimeoutException e) {
+            e.printStackTrace();
+        } catch (AdbCommandRejectedException e) {
+            e.printStackTrace();
+        } catch (ShellCommandUnresponsiveException e) {
+            e.printStackTrace();
         }
         return result[0];
     }
diff --git a/hierarchyviewer/src/com/android/hierarchyviewer/device/Window.java b/hierarchyviewer/src/com/android/hierarchyviewer/device/Window.java
index 0417df6..5c87d33 100644
--- a/hierarchyviewer/src/com/android/hierarchyviewer/device/Window.java
+++ b/hierarchyviewer/src/com/android/hierarchyviewer/device/Window.java
@@ -39,6 +39,7 @@ public class Window {
         return Integer.toHexString(hashCode);
     }
 
+    @Override
     public String toString() {
         return title;
     }
diff --git a/hierarchyviewer/src/com/android/hierarchyviewer/laf/UnifiedContentBorder.java b/hierarchyviewer/src/com/android/hierarchyviewer/laf/UnifiedContentBorder.java
index 401fb3e..873b275 100644
--- a/hierarchyviewer/src/com/android/hierarchyviewer/laf/UnifiedContentBorder.java
+++ b/hierarchyviewer/src/com/android/hierarchyviewer/laf/UnifiedContentBorder.java
@@ -24,6 +24,7 @@ public class UnifiedContentBorder extends AbstractBorder {
     private static final Color BORDER_BOTTOM_COLOR1 = new Color(0x404040);
     private static final Color BORDER_BOTTOM_COLOR2 = new Color(0xd8d8d8);
 
+    @Override
     public void paintBorder(Component c, Graphics g, int x, int y, int width, int height) {
         g.setColor(BORDER_TOP_COLOR1);
         g.drawLine(x, y, x + width, y);
@@ -33,10 +34,12 @@ public class UnifiedContentBorder extends AbstractBorder {
         g.drawLine(x, y + height - 1, x + width, y + height - 1);
     }
 
+    @Override
     public Insets getBorderInsets(Component component) {
         return new Insets(1, 0, 2, 0);
     }
 
+    @Override
     public boolean isBorderOpaque() {
         return true;
     }