diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java index 7c475c9..33c5422 100644 --- a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java +++ b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java @@ -10,7 +10,7 @@ import javax.usb.UsbConfigurationDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * Simple USB configuration descriptor. @@ -168,6 +168,6 @@ public final class SimpleUsbConfigurationDescriptor extends SimpleUsbDescriptor @Override public String toString() { - return DumpUtils.dump(this); + return DescriptorUtils.dump(this); } } diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java index ee666c7..bd52e5e 100644 --- a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java +++ b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java @@ -10,7 +10,7 @@ import javax.usb.UsbDeviceDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * Simple USB device descriptor. @@ -258,6 +258,6 @@ public final class SimpleUsbDeviceDescriptor extends SimpleUsbDescriptor @Override public String toString() { - return DumpUtils.dump(this); + return DescriptorUtils.dump(this); } } diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbEndpointDescriptor.java b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbEndpointDescriptor.java index cd153d5..9f87793 100644 --- a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbEndpointDescriptor.java +++ b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbEndpointDescriptor.java @@ -10,7 +10,7 @@ import javax.usb.UsbEndpointDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * Simple USB endpoint descriptor. @@ -136,6 +136,6 @@ public final class SimpleUsbEndpointDescriptor extends SimpleUsbDescriptor @Override public String toString() { - return DumpUtils.dump(this); + return DescriptorUtils.dump(this); } } diff --git a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java index 64ba979..f254086 100644 --- a/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java +++ b/src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java @@ -10,7 +10,7 @@ import javax.usb.UsbInterfaceDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * Simple USB interface descriptor. @@ -182,6 +182,6 @@ public final class SimpleUsbInterfaceDescriptor extends SimpleUsbDescriptor @Override public String toString() { - return DumpUtils.dump(this); + return DescriptorUtils.dump(this); } } diff --git a/src/main/java/de/ailis/usb4java/libusb/ConfigDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/ConfigDescriptor.java index d11f6c7..c766428 100644 --- a/src/main/java/de/ailis/usb4java/libusb/ConfigDescriptor.java +++ b/src/main/java/de/ailis/usb4java/libusb/ConfigDescriptor.java @@ -18,7 +18,7 @@ import javax.usb.UsbConfigurationDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * A structure representing the standard USB configuration descriptor. @@ -143,7 +143,7 @@ public final class ConfigDescriptor implements UsbConfigurationDescriptor bmAttributes() & 0xff, (bMaxPower() & 0xff) * 2, extraLength(), - DumpUtils.toHexDump(extra()).replaceAll("(?m)^", " "))); + DescriptorUtils.dump(extra()).replaceAll("(?m)^", " "))); for (final Interface descriptor: iface()) { builder.append(descriptor.dump(handle) diff --git a/src/main/java/de/ailis/usb4java/libusb/DeviceDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/DeviceDescriptor.java index bf89a9c..09fd083 100644 --- a/src/main/java/de/ailis/usb4java/libusb/DeviceDescriptor.java +++ b/src/main/java/de/ailis/usb4java/libusb/DeviceDescriptor.java @@ -18,7 +18,7 @@ import javax.usb.UsbDeviceDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * A structure representing the standard USB device descriptor. @@ -142,14 +142,14 @@ public final class DeviceDescriptor implements UsbDeviceDescriptor + " bNumConfigurations %5d", bLength() & 0xff, bDescriptorType() % 0xff, - DumpUtils.decodeBCD(bcdUSB()), - bDeviceClass() & 0xff, DumpUtils.getUSBClassName(bDeviceClass()), + DescriptorUtils.decodeBCD(bcdUSB()), + bDeviceClass() & 0xff, DescriptorUtils.getUSBClassName(bDeviceClass()), bDeviceSubClass() & 0xff, bDeviceProtocol() & 0xff, bMaxPacketSize0() & 0xff, idVendor() & 0xffff, idProduct() & 0xffff, - DumpUtils.decodeBCD(bcdDevice()), + DescriptorUtils.decodeBCD(bcdDevice()), iManufacturer & 0xff, sManufacturer, iProduct & 0xff, sProduct, iSerialNumber & 0xff, sSerialNumber, diff --git a/src/main/java/de/ailis/usb4java/libusb/EndpointDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/EndpointDescriptor.java index cb9096b..f445677 100644 --- a/src/main/java/de/ailis/usb4java/libusb/EndpointDescriptor.java +++ b/src/main/java/de/ailis/usb4java/libusb/EndpointDescriptor.java @@ -18,7 +18,7 @@ import javax.usb.UsbEndpointDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * A structure representing the standard USB endpoint descriptor. @@ -126,7 +126,7 @@ public final class EndpointDescriptor implements UsbEndpointDescriptor wMaxPacketSize() & 0xffff, bInterval() & 0xff, extraLength(), - DumpUtils.toHexDump(extra()).replaceAll("(?m)^", " ")); + DescriptorUtils.dump(extra()).replaceAll("(?m)^", " ")); } @Override diff --git a/src/main/java/de/ailis/usb4java/libusb/InterfaceDescriptor.java b/src/main/java/de/ailis/usb4java/libusb/InterfaceDescriptor.java index f1583b2..cb2220f 100644 --- a/src/main/java/de/ailis/usb4java/libusb/InterfaceDescriptor.java +++ b/src/main/java/de/ailis/usb4java/libusb/InterfaceDescriptor.java @@ -18,7 +18,7 @@ import javax.usb.UsbInterfaceDescriptor; import org.apache.commons.lang3.builder.EqualsBuilder; import org.apache.commons.lang3.builder.HashCodeBuilder; -import de.ailis.usb4java.utils.DumpUtils; +import de.ailis.usb4java.utils.DescriptorUtils; /** * A structure representing the standard USB interface descriptor. @@ -146,12 +146,12 @@ public final class InterfaceDescriptor implements UsbInterfaceDescriptor bAlternateSetting() & 0xff, bNumEndpoints() & 0xff, bInterfaceClass() & 0xff, - DumpUtils.getUSBClassName(bInterfaceClass()), + DescriptorUtils.getUSBClassName(bInterfaceClass()), bInterfaceSubClass() & 0xff, bInterfaceProtocol() & 0xff, iInterface() & 0xff, sInterface, extraLength(), - DumpUtils.toHexDump(extra()).replaceAll("(?m)^", " "))); + DescriptorUtils.dump(extra()).replaceAll("(?m)^", " "))); if (extraLength() != 0) return builder.toString(); for (final EndpointDescriptor edesc: endpoint()) { diff --git a/src/main/java/de/ailis/usb4java/utils/DumpUtils.java b/src/main/java/de/ailis/usb4java/utils/DescriptorUtils.java similarity index 97% rename from src/main/java/de/ailis/usb4java/utils/DumpUtils.java rename to src/main/java/de/ailis/usb4java/utils/DescriptorUtils.java index 197d058..2743e13 100644 --- a/src/main/java/de/ailis/usb4java/utils/DumpUtils.java +++ b/src/main/java/de/ailis/usb4java/utils/DescriptorUtils.java @@ -17,11 +17,11 @@ import javax.usb.UsbInterfaceDescriptor; import de.ailis.usb4java.libusb.LibUSB; /** - * Utility functions used for descriptor dumps. + * Utility methods used for descriptor dumps. * * @author Klaus Reimer (k@ailis.de) */ -public final class DumpUtils +public final class DescriptorUtils { /** Mapping from USB class id to USB class name. */ private static final Map CLASS_NAMES = @@ -53,7 +53,7 @@ public final class DumpUtils /** * Private constructor to prevent instantiation. */ - private DumpUtils() + private DescriptorUtils() { // Empty } @@ -86,13 +86,13 @@ public final class DumpUtils } /** - * Returns a hex dump of the specified byte buffer. + * Dumps the specified byte buffer into a hex string and returns it. * * @param bytes * The bytes to dump. * @return The hex dump. */ - public static String toHexDump(final ByteBuffer bytes) + public static String dump(final ByteBuffer bytes) { final int columns = 16; bytes.rewind();