Using LibUsbException instead of RuntimeException

kayahr · kayahr · commit 0b59de3e7c05 · 2014-03-02T20:55:26.000+01:00
diff --git a/src/main/java/org/usb4java/examples/DumpDevices.java b/src/main/java/org/usb4java/examples/DumpDevices.java
@@ -13,6 +13,7 @@
 import org.usb4java.DeviceHandle;
 import org.usb4java.DeviceList;
 import org.usb4java.LibUsb;
+import org.usb4java.LibUsbException;
 
 /**
  * Dumps the descriptors of all available devices.
@@ -43,8 +44,8 @@ public static void dumpConfigurationDescriptors(final Device device,
             final int result = LibUsb.getConfigDescriptor(device, i, descriptor);
             if (result < 0)
             {
-                throw new RuntimeException(
-                    "Unable to read config descriptor. Result=" + result);
+                throw new LibUsbException("Unable to read config descriptor",
+                    result);
             }
             try
             {
@@ -97,8 +98,8 @@ public static void dumpDevice(final Device device)
         int result = LibUsb.getDeviceDescriptor(device, descriptor);
         if (result < 0)
         {
-            throw new RuntimeException(
-                "Unable to read device descriptor. Result=" + result);
+            throw new LibUsbException("Unable to read device descriptor",
+                result);
         }
 
         // Try to open the device. This may fail because user has no
@@ -143,17 +144,15 @@ public static void main(final String[] args)
         int result = LibUsb.init(context);
         if (result < 0)
         {
-            throw new RuntimeException(
-                "Unable to initialize libusb. Result=" + result);
+            throw new LibUsbException("Unable to initialize libusb", result);
         }
 
         // Read the USB device list
         final DeviceList list = new DeviceList();
         result = LibUsb.getDeviceList(context, list);
         if (result < 0)
         {
-            throw new RuntimeException(
-                "Unable to get device list. Result=" + result);
+            throw new LibUsbException("Unable to get device list", result);
         }
 
         try
diff --git a/src/main/java/org/usb4java/examples/ListDevices.java b/src/main/java/org/usb4java/examples/ListDevices.java
@@ -10,6 +10,7 @@
 import org.usb4java.DeviceDescriptor;
 import org.usb4java.DeviceList;
 import org.usb4java.LibUsb;
+import org.usb4java.LibUsbException;
 
 /**
  * Simply lists all available USB devices.
@@ -33,17 +34,15 @@ public static void main(String[] args)
         int result = LibUsb.init(context);
         if (result < 0)
         {
-            throw new RuntimeException(
-                "Unable to initialize libusb. Result=" + result);
+            throw new LibUsbException("Unable to initialize libusb", result);
         }
 
         // Read the USB device list
         DeviceList list = new DeviceList();
         result = LibUsb.getDeviceList(context, list);
         if (result < 0)
         {
-            throw new RuntimeException(
-                "Unable to get device list. Result=" + result);
+            throw new LibUsbException("Unable to get device list", result);
         }
 
         try
@@ -57,8 +56,8 @@ public static void main(String[] args)
                 result = LibUsb.getDeviceDescriptor(device, descriptor);
                 if (result < 0)
                 {
-                    throw new RuntimeException(
-                        "Unable to read device descriptor. Result=" + result);
+                    throw new LibUsbException(
+                        "Unable to read device descriptor", result);
                 }
                 System.out.format(
                     "Bus %03d, Device %03d: Vendor %04x, Product %04x%n",

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@`
`13`	`13`	`import org.usb4java.DeviceHandle;`
`14`	`14`	`import org.usb4java.DeviceList;`
`15`	`15`	`import org.usb4java.LibUsb;`
	`16`	`+import org.usb4java.LibUsbException;`
`16`	`17`
`17`	`18`	`/**`
`18`	`19`	`* Dumps the descriptors of all available devices.`
`@@ -43,8 +44,8 @@ public static void dumpConfigurationDescriptors(final Device device,`
`43`	`44`	`final int result = LibUsb.getConfigDescriptor(device, i, descriptor);`
`44`	`45`	`if (result < 0)`
`45`	`46`	`{`
`46`		`- throw new RuntimeException(`
`47`		`- "Unable to read config descriptor. Result=" + result);`
	`47`	`+ throw new LibUsbException("Unable to read config descriptor",`
	`48`	`+ result);`
`48`	`49`	`}`
`49`	`50`	`try`
`50`	`51`	`{`
`@@ -97,8 +98,8 @@ public static void dumpDevice(final Device device)`
`97`	`98`	`int result = LibUsb.getDeviceDescriptor(device, descriptor);`
`98`	`99`	`if (result < 0)`
`99`	`100`	`{`
`100`		`- throw new RuntimeException(`
`101`		`- "Unable to read device descriptor. Result=" + result);`
	`101`	`+ throw new LibUsbException("Unable to read device descriptor",`
	`102`	`+ result);`
`102`	`103`	`}`
`103`	`104`
`104`	`105`	`// Try to open the device. This may fail because user has no`
`@@ -143,17 +144,15 @@ public static void main(final String[] args)`
`143`	`144`	`int result = LibUsb.init(context);`
`144`	`145`	`if (result < 0)`
`145`	`146`	`{`
`146`		`- throw new RuntimeException(`
`147`		`- "Unable to initialize libusb. Result=" + result);`
	`147`	`+ throw new LibUsbException("Unable to initialize libusb", result);`
`148`	`148`	`}`
`149`	`149`
`150`	`150`	`// Read the USB device list`
`151`	`151`	`final DeviceList list = new DeviceList();`
`152`	`152`	`result = LibUsb.getDeviceList(context, list);`
`153`	`153`	`if (result < 0)`
`154`	`154`	`{`
`155`		`- throw new RuntimeException(`
`156`		`- "Unable to get device list. Result=" + result);`
	`155`	`+ throw new LibUsbException("Unable to get device list", result);`
`157`	`156`	`}`
`158`	`157`
`159`	`158`	`try`
Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`import org.usb4java.DeviceDescriptor;`
`11`	`11`	`import org.usb4java.DeviceList;`
`12`	`12`	`import org.usb4java.LibUsb;`
	`13`	`+import org.usb4java.LibUsbException;`
`13`	`14`
`14`	`15`	`/**`
`15`	`16`	`* Simply lists all available USB devices.`
`@@ -33,17 +34,15 @@ public static void main(String[] args)`
`33`	`34`	`int result = LibUsb.init(context);`
`34`	`35`	`if (result < 0)`
`35`	`36`	`{`
`36`		`- throw new RuntimeException(`
`37`		`- "Unable to initialize libusb. Result=" + result);`
	`37`	`+ throw new LibUsbException("Unable to initialize libusb", result);`
`38`	`38`	`}`
`39`	`39`
`40`	`40`	`// Read the USB device list`
`41`	`41`	`DeviceList list = new DeviceList();`
`42`	`42`	`result = LibUsb.getDeviceList(context, list);`
`43`	`43`	`if (result < 0)`
`44`	`44`	`{`
`45`		`- throw new RuntimeException(`
`46`		`- "Unable to get device list. Result=" + result);`
	`45`	`+ throw new LibUsbException("Unable to get device list", result);`
`47`	`46`	`}`
`48`	`47`
`49`	`48`	`try`
`@@ -57,8 +56,8 @@ public static void main(String[] args)`
`57`	`56`	`result = LibUsb.getDeviceDescriptor(device, descriptor);`
`58`	`57`	`if (result < 0)`
`59`	`58`	`{`
`60`		`- throw new RuntimeException(`
`61`		`- "Unable to read device descriptor. Result=" + result);`
	`59`	`+ throw new LibUsbException(`
	`60`	`+ "Unable to read device descriptor", result);`
`62`	`61`	`}`
`63`	`62`	`System.out.format(`
`64`	`63`	`"Bus %03d, Device %03d: Vendor %04x, Product %04x%n",`