sparrowwallet/usb4java
sparrowwallet/usb4java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename DumpUtils to DescriptorUtils

Browse Source
This commit is contained in:
Klaus Reimer 2013-04-13 17:35:44 +02:00
parent 94ae441189
commit 717c887541
9 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/de/ailis/usb4java/descriptors/SimpleUsbConfigurationDescriptor.java
View File

@ -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);
}
}

4
src/main/java/de/ailis/usb4java/descriptors/SimpleUsbDeviceDescriptor.java
View File

@ -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);
}
}

4
src/main/java/de/ailis/usb4java/descriptors/SimpleUsbEndpointDescriptor.java
View File

@ -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);
}
}

4
src/main/java/de/ailis/usb4java/descriptors/SimpleUsbInterfaceDescriptor.java
View File

@ -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);
}
}

4
src/main/java/de/ailis/usb4java/libusb/ConfigDescriptor.java
View File

@ -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)

8
src/main/java/de/ailis/usb4java/libusb/DeviceDescriptor.java
View File

@ -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,

4
src/main/java/de/ailis/usb4java/libusb/EndpointDescriptor.java
View File

@ -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

6
src/main/java/de/ailis/usb4java/libusb/InterfaceDescriptor.java
View File

@ -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())
{

10
src/main/java/de/ailis/usb4java/utils/DumpUtils.java → src/main/java/de/ailis/usb4java/utils/DescriptorUtils.java
View File

@ -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<Integer, String> 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();