From a5f5eb62ee6476cc44e1102dc50ace9720014609 Mon Sep 17 00:00:00 2001 From: Luca Longinotti Date: Sat, 15 Feb 2014 21:56:31 +0100 Subject: [PATCH] Move LibUsbException to org.usb4java, as it's never used in org.libusb4java, and only makes sense as a convenience outside of it. Nothing in org.libusb4java now depends on javax.usb, the only remaining dependency is Apache's commons-lang. --- src/main/java/org/usb4java/AbstractDevice.java | 1 - src/main/java/org/usb4java/AbstractIrpQueue.java | 1 - src/main/java/org/usb4java/Configuration.java | 1 - src/main/java/org/usb4java/DeviceManager.java | 1 - src/main/java/org/usb4java/Hub.java | 1 - src/main/java/org/usb4java/IrpQueue.java | 1 - .../java/org/{libusb4java => usb4java}/LibUsbException.java | 4 +++- src/main/java/org/usb4java/NonHub.java | 1 - 8 files changed, 3 insertions(+), 8 deletions(-) rename src/main/java/org/{libusb4java => usb4java}/LibUsbException.java (96%) diff --git a/src/main/java/org/usb4java/AbstractDevice.java b/src/main/java/org/usb4java/AbstractDevice.java index f27a413..74059cb 100644 --- a/src/main/java/org/usb4java/AbstractDevice.java +++ b/src/main/java/org/usb4java/AbstractDevice.java @@ -32,7 +32,6 @@ import org.libusb4java.ConfigDescriptor; import org.libusb4java.Device; import org.libusb4java.DeviceHandle; import org.libusb4java.LibUsb; -import org.libusb4java.LibUsbException; /** * A Usb device. diff --git a/src/main/java/org/usb4java/AbstractIrpQueue.java b/src/main/java/org/usb4java/AbstractIrpQueue.java index bc9f0c4..35643aa 100644 --- a/src/main/java/org/usb4java/AbstractIrpQueue.java +++ b/src/main/java/org/usb4java/AbstractIrpQueue.java @@ -16,7 +16,6 @@ import javax.usb.UsbShortPacketException; import org.libusb4java.DeviceHandle; import org.libusb4java.LibUsb; -import org.libusb4java.LibUsbException; /** diff --git a/src/main/java/org/usb4java/Configuration.java b/src/main/java/org/usb4java/Configuration.java index 6ed4f82..d6cbf96 100644 --- a/src/main/java/org/usb4java/Configuration.java +++ b/src/main/java/org/usb4java/Configuration.java @@ -21,7 +21,6 @@ import org.usb4java.descriptors.SimpleUsbConfigurationDescriptor; import org.libusb4java.ConfigDescriptor; import org.libusb4java.InterfaceDescriptor; import org.libusb4java.LibUsb; -import org.libusb4java.LibUsbException; /** * usb4java implementation of JSR-80 UsbConfiguration. diff --git a/src/main/java/org/usb4java/DeviceManager.java b/src/main/java/org/usb4java/DeviceManager.java index 0c50252..b4586ad 100644 --- a/src/main/java/org/usb4java/DeviceManager.java +++ b/src/main/java/org/usb4java/DeviceManager.java @@ -20,7 +20,6 @@ import org.libusb4java.Device; import org.libusb4java.DeviceDescriptor; import org.libusb4java.DeviceList; import org.libusb4java.LibUsb; -import org.libusb4java.LibUsbException; /** * Manages the USB devices. diff --git a/src/main/java/org/usb4java/Hub.java b/src/main/java/org/usb4java/Hub.java index 3315543..bab2637 100644 --- a/src/main/java/org/usb4java/Hub.java +++ b/src/main/java/org/usb4java/Hub.java @@ -10,7 +10,6 @@ import java.util.List; import javax.usb.UsbHub; import org.libusb4java.Device; -import org.libusb4java.LibUsbException; /** * usb4java implementation of JSR-80 UsbHub. diff --git a/src/main/java/org/usb4java/IrpQueue.java b/src/main/java/org/usb4java/IrpQueue.java index 497fd75..d20f452 100644 --- a/src/main/java/org/usb4java/IrpQueue.java +++ b/src/main/java/org/usb4java/IrpQueue.java @@ -18,7 +18,6 @@ import javax.usb.UsbShortPacketException; import org.libusb4java.DeviceHandle; import org.libusb4java.LibUsb; -import org.libusb4java.LibUsbException; /** * A queue for USB I/O request packets. diff --git a/src/main/java/org/libusb4java/LibUsbException.java b/src/main/java/org/usb4java/LibUsbException.java similarity index 96% rename from src/main/java/org/libusb4java/LibUsbException.java rename to src/main/java/org/usb4java/LibUsbException.java index ef771df..7caaa63 100644 --- a/src/main/java/org/libusb4java/LibUsbException.java +++ b/src/main/java/org/usb4java/LibUsbException.java @@ -16,10 +16,12 @@ * Copyright 2012-2013 Toby Gray */ -package org.libusb4java; +package org.usb4java; import javax.usb.UsbException; +import org.libusb4java.LibUsb; + /** * libusb-specific USB exception. * diff --git a/src/main/java/org/usb4java/NonHub.java b/src/main/java/org/usb4java/NonHub.java index 1a5e149..a71132e 100644 --- a/src/main/java/org/usb4java/NonHub.java +++ b/src/main/java/org/usb4java/NonHub.java @@ -6,7 +6,6 @@ package org.usb4java; import org.libusb4java.Device; -import org.libusb4java.LibUsbException; /** * A non-hub USB device.