From e843d73b60e1c0af505bbfe89eb05e5d2ec935d4 Mon Sep 17 00:00:00 2001 From: Klaus Reimer Date: Sun, 23 Feb 2014 14:11:02 +0100 Subject: [PATCH] Fix some style guide violations --- .../usb4java/BosDevCapabilityDescriptor.java | 3 +- .../org/usb4java/ContainerIdDescriptor.java | 3 +- src/main/java/org/usb4java/DeviceHandle.java | 4 +- .../java/org/usb4java/HotplugCallback.java | 3 +- .../org/usb4java/HotplugCallbackHandle.java | 4 +- .../org/usb4java/IsoPacketDescriptor.java | 4 +- src/main/java/org/usb4java/LibUsb.java | 43 +++++++++++-------- src/main/java/org/usb4java/Loader.java | 6 ++- .../SsEndpointCompanionDescriptor.java | 6 ++- .../SsUsbDeviceCapabilityDescriptor.java | 6 ++- .../usb4java/Usb20ExtensionDescriptor.java | 3 +- .../org/usb4java/utils/DescriptorUtils.java | 9 ++-- 12 files changed, 56 insertions(+), 38 deletions(-) diff --git a/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java b/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java index 8dc6f19..1f9104a 100644 --- a/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java +++ b/src/main/java/org/usb4java/BosDevCapabilityDescriptor.java @@ -131,7 +131,8 @@ public final class BosDevCapabilityDescriptor return false; } - final BosDevCapabilityDescriptor other = (BosDevCapabilityDescriptor) obj; + final BosDevCapabilityDescriptor other = + (BosDevCapabilityDescriptor) obj; return new EqualsBuilder() .append(this.bLength(), other.bLength()) diff --git a/src/main/java/org/usb4java/ContainerIdDescriptor.java b/src/main/java/org/usb4java/ContainerIdDescriptor.java index 5b9f4ef..daa68ab 100644 --- a/src/main/java/org/usb4java/ContainerIdDescriptor.java +++ b/src/main/java/org/usb4java/ContainerIdDescriptor.java @@ -40,7 +40,8 @@ public final class ContainerIdDescriptor /** * Constructs a new Container Id descriptor which can be passed to the - * {@link LibUsb#getContainerIdDescriptor(Context, BosDevCapabilityDescriptor, ContainerIdDescriptor)} + * {@link LibUsb#getContainerIdDescriptor(Context, + * BosDevCapabilityDescriptor, ContainerIdDescriptor)} * method. */ public ContainerIdDescriptor() diff --git a/src/main/java/org/usb4java/DeviceHandle.java b/src/main/java/org/usb4java/DeviceHandle.java index f13cbe5..9d449e7 100644 --- a/src/main/java/org/usb4java/DeviceHandle.java +++ b/src/main/java/org/usb4java/DeviceHandle.java @@ -59,8 +59,8 @@ public final class DeviceHandle { final int prime = 31; int result = 1; - result = (prime * result) - + (int) (this.deviceHandlePointer ^ (this.deviceHandlePointer >>> 32)); + result = (prime * result) + (int) (this.deviceHandlePointer ^ + (this.deviceHandlePointer >>> 32)); return result; } diff --git a/src/main/java/org/usb4java/HotplugCallback.java b/src/main/java/org/usb4java/HotplugCallback.java index f97d1bd..c474a9b 100644 --- a/src/main/java/org/usb4java/HotplugCallback.java +++ b/src/main/java/org/usb4java/HotplugCallback.java @@ -41,5 +41,6 @@ public interface HotplugCallback * @return Whether this callback is finished processing events. Returning 1 * will cause this callback to be deregistered. */ - int processEvent(Context context, Device device, int event, Object userData); + int processEvent(Context context, Device device, int event, + Object userData); } diff --git a/src/main/java/org/usb4java/HotplugCallbackHandle.java b/src/main/java/org/usb4java/HotplugCallbackHandle.java index d6ab390..8cc9cef 100644 --- a/src/main/java/org/usb4java/HotplugCallbackHandle.java +++ b/src/main/java/org/usb4java/HotplugCallbackHandle.java @@ -61,8 +61,8 @@ public final class HotplugCallbackHandle { final int prime = 31; int result = 1; - result = (prime * result) - + (int) (this.hotplugCallbackHandleValue ^ (this.hotplugCallbackHandleValue >>> 32)); + result = (prime * result) + (int) (this.hotplugCallbackHandleValue ^ + (this.hotplugCallbackHandleValue >>> 32)); return result; } diff --git a/src/main/java/org/usb4java/IsoPacketDescriptor.java b/src/main/java/org/usb4java/IsoPacketDescriptor.java index eed1334..78a45d1 100644 --- a/src/main/java/org/usb4java/IsoPacketDescriptor.java +++ b/src/main/java/org/usb4java/IsoPacketDescriptor.java @@ -84,8 +84,8 @@ public final class IsoPacketDescriptor { final int prime = 31; int result = 1; - result = (prime * result) - + (int) (this.isoPacketDescriptorPointer ^ (this.isoPacketDescriptorPointer >>> 32)); + result = (prime * result) + (int) (this.isoPacketDescriptorPointer ^ + (this.isoPacketDescriptorPointer >>> 32)); return result; } diff --git a/src/main/java/org/usb4java/LibUsb.java b/src/main/java/org/usb4java/LibUsb.java index 67dac50..390fe6b 100644 --- a/src/main/java/org/usb4java/LibUsb.java +++ b/src/main/java/org/usb4java/LibUsb.java @@ -442,7 +442,8 @@ public final class LibUsb /** We unwrap the BOS => define its maximum size. */ public static final byte DT_BOS_MAX_SIZE = ((DT_BOS_SIZE) - + (BT_USB_2_0_EXTENSION_SIZE) + (BT_SS_USB_DEVICE_CAPABILITY_SIZE) + (BT_CONTAINER_ID_SIZE)); + + (BT_USB_2_0_EXTENSION_SIZE) + (BT_SS_USB_DEVICE_CAPABILITY_SIZE) + + (BT_CONTAINER_ID_SIZE)); // Endpoint direction. Values for bit 7 of the endpoint address scheme. @@ -624,13 +625,15 @@ public final class LibUsb /** * Hotplug callbacks (to correctly manage calls and additional data). */ - private static final ConcurrentMap> hotplugCallbacks = + private static final ConcurrentMap> hotplugCallbacks = new ConcurrentHashMap>(); /** * Pollfd listeners (to support different listeners for different contexts). */ - private static final ConcurrentMap> pollfdListeners = + private static final ConcurrentMap> pollfdListeners = new ConcurrentHashMap>(); static @@ -943,7 +946,8 @@ public final class LibUsb * {@link #ERROR_NO_DEVICE} if the device has been disconnected * another error on other failure */ - public static native int open(final Device device, final DeviceHandle handle); + public static native int open(final Device device, + final DeviceHandle handle); /** * Convenience function for finding a device with a particular @@ -1535,7 +1539,8 @@ public final class LibUsb * @param companionDescriptor * Output location for the superspeed endpoint companion * descriptor. Only valid if 0 was returned. Must be freed with - * {@link #freeSsEndpointCompanionDescriptor(SsEndpointCompanionDescriptor)} + * {@link #freeSsEndpointCompanionDescriptor + * (SsEndpointCompanionDescriptor)} * after use. * @return {@link #SUCCESS} on success, {@link #ERROR_NOT_FOUND} if the * descriptor does not exist, another error code on error @@ -1546,8 +1551,8 @@ public final class LibUsb /** * Free a superspeed endpoint companion descriptor obtained from - * {@link #getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, SsEndpointCompanionDescriptor)} - * . + * {@link #getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, + * SsEndpointCompanionDescriptor)}. * * It is safe to call this function with a NULL parameter, in which case the * function simply returns. @@ -1597,8 +1602,8 @@ public final class LibUsb * @param extensionDescriptor * Output location for the USB 2.0 Extension descriptor. Only * valid if 0 was returned. Must be freed with - * {@link #freeUsb20ExtensionDescriptor(Usb20ExtensionDescriptor)} - * after use. + * {@link #freeUsb20ExtensionDescriptor( + * Usb20ExtensionDescriptor)} after use. * @return 0 on success a LIBUSB_ERROR code on error */ public static native int getUsb20ExtensionDescriptor(final Context context, @@ -1607,8 +1612,8 @@ public final class LibUsb /** * Free a USB 2.0 Extension descriptor obtained from - * {@link #getUsb20ExtensionDescriptor(Context, BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)} - * . + * {@link #getUsb20ExtensionDescriptor(Context, BosDevCapabilityDescriptor, + * Usb20ExtensionDescriptor)}. * * It is safe to call this function with a NULL parameter, in which case * the function simply returns. @@ -1631,8 +1636,8 @@ public final class LibUsb * Output location for the SuperSpeed USB Device Capability * descriptor. Only valid if {@link #SUCCESS} was returned. * Must be freed with - * {@link #freeSsUsbDeviceCapabilityDescriptor(SsUsbDeviceCapabilityDescriptor)} - * after use. + * {@link #freeSsUsbDeviceCapabilityDescriptor( + * SsUsbDeviceCapabilityDescriptor)} after use. * @return {@link #SUCCESS} on success, an error code on error. */ public static native int getSsUsbDeviceCapabilityDescriptor( @@ -1642,8 +1647,8 @@ public final class LibUsb /** * Free a SuperSpeed USB Device Capability descriptor obtained from - * {@link #getSsUsbDeviceCapabilityDescriptor(Context, BosDevCapabilityDescriptor, SsUsbDeviceCapabilityDescriptor)} - * . + * {@link #getSsUsbDeviceCapabilityDescriptor(Context, + * BosDevCapabilityDescriptor, SsUsbDeviceCapabilityDescriptor)}. * * It is safe to call this function with a NULL parameter, * in which case the function simply returns. @@ -1675,8 +1680,8 @@ public final class LibUsb /** * Free a Container ID descriptor obtained from - * {@link #getContainerIdDescriptor(Context, BosDevCapabilityDescriptor, ContainerIdDescriptor)} - * . + * {@link #getContainerIdDescriptor(Context, BosDevCapabilityDescriptor, + * ContainerIdDescriptor)}. * * It is safe to call this function with a NULL parameter, in which case * the function simply returns. @@ -2834,8 +2839,8 @@ public final class LibUsb : (vendorId & 0xFFFF), (productId == LibUsb.HOTPLUG_MATCH_ANY) ? (LibUsb.HOTPLUG_MATCH_ANY) : (productId & 0xFFFF), - (deviceClass == LibUsb.HOTPLUG_MATCH_ANY) ? (LibUsb.HOTPLUG_MATCH_ANY) - : (deviceClass & 0xFF), + (deviceClass == LibUsb.HOTPLUG_MATCH_ANY) ? + (LibUsb.HOTPLUG_MATCH_ANY) : (deviceClass & 0xFF), callbackHandle, globalHotplugId); if (result == LibUsb.SUCCESS) diff --git a/src/main/java/org/usb4java/Loader.java b/src/main/java/org/usb4java/Loader.java index 666a39b..320d414 100644 --- a/src/main/java/org/usb4java/Loader.java +++ b/src/main/java/org/usb4java/Loader.java @@ -149,7 +149,8 @@ public final class Loader } throw new LoaderException("Unable to determine the shared library " + "file extension for operating system '" + os - + "'. Please specify Java parameter -D" + key + "="); + + "'. Please specify Java parameter -D" + key + + "="); } /** @@ -265,7 +266,8 @@ public final class Loader * The library name to extract (For example "libusb0.dll") * @return The absolute path to the extracted library. */ - private static String extractLibrary(final String platform, final String lib) + private static String extractLibrary(final String platform, + final String lib) { // Extract the usb4java library final String source = '/' diff --git a/src/main/java/org/usb4java/SsEndpointCompanionDescriptor.java b/src/main/java/org/usb4java/SsEndpointCompanionDescriptor.java index 2033435..e3bf59f 100644 --- a/src/main/java/org/usb4java/SsEndpointCompanionDescriptor.java +++ b/src/main/java/org/usb4java/SsEndpointCompanionDescriptor.java @@ -36,7 +36,8 @@ public final class SsEndpointCompanionDescriptor /** * Constructs a new descriptor which can be passed to the - * {@link LibUsb#getSsEndpointCompanionDescriptor(Context, EndpointDescriptor, SsEndpointCompanionDescriptor)} + * {@link LibUsb#getSsEndpointCompanionDescriptor(Context, + * EndpointDescriptor, SsEndpointCompanionDescriptor)} * method. */ public SsEndpointCompanionDescriptor() @@ -143,7 +144,8 @@ public final class SsEndpointCompanionDescriptor return false; } - final SsEndpointCompanionDescriptor other = (SsEndpointCompanionDescriptor) obj; + final SsEndpointCompanionDescriptor other = + (SsEndpointCompanionDescriptor) obj; return new EqualsBuilder() .append(this.bLength(), other.bLength()) diff --git a/src/main/java/org/usb4java/SsUsbDeviceCapabilityDescriptor.java b/src/main/java/org/usb4java/SsUsbDeviceCapabilityDescriptor.java index c581adc..249b891 100644 --- a/src/main/java/org/usb4java/SsUsbDeviceCapabilityDescriptor.java +++ b/src/main/java/org/usb4java/SsUsbDeviceCapabilityDescriptor.java @@ -38,7 +38,8 @@ public final class SsUsbDeviceCapabilityDescriptor /** * Constructs a new SuperSpeed USB Device Capability descriptor which can * be passed to the - * {@link LibUsb#getSsUsbDeviceCapabilityDescriptor(Context, BosDevCapabilityDescriptor, SsUsbDeviceCapabilityDescriptor)} + * {@link LibUsb#getSsUsbDeviceCapabilityDescriptor(Context, + * BosDevCapabilityDescriptor, SsUsbDeviceCapabilityDescriptor)} * method. */ public SsUsbDeviceCapabilityDescriptor() @@ -172,7 +173,8 @@ public final class SsUsbDeviceCapabilityDescriptor return false; } - final SsUsbDeviceCapabilityDescriptor other = (SsUsbDeviceCapabilityDescriptor) obj; + final SsUsbDeviceCapabilityDescriptor other = + (SsUsbDeviceCapabilityDescriptor) obj; return new EqualsBuilder() .append(this.bLength(), other.bLength()) diff --git a/src/main/java/org/usb4java/Usb20ExtensionDescriptor.java b/src/main/java/org/usb4java/Usb20ExtensionDescriptor.java index d2c02fc..2fc63c4 100644 --- a/src/main/java/org/usb4java/Usb20ExtensionDescriptor.java +++ b/src/main/java/org/usb4java/Usb20ExtensionDescriptor.java @@ -36,7 +36,8 @@ public final class Usb20ExtensionDescriptor /** * Constructs a new USB 2.0 Extension descriptor which can be passed to the - * {@link LibUsb#getUsb20ExtensionDescriptor(Context, BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)} + * {@link LibUsb#getUsb20ExtensionDescriptor(Context, + * BosDevCapabilityDescriptor, Usb20ExtensionDescriptor)} * method. */ public Usb20ExtensionDescriptor() diff --git a/src/main/java/org/usb4java/utils/DescriptorUtils.java b/src/main/java/org/usb4java/utils/DescriptorUtils.java index 52edf48..dae1a03 100644 --- a/src/main/java/org/usb4java/utils/DescriptorUtils.java +++ b/src/main/java/org/usb4java/utils/DescriptorUtils.java @@ -23,7 +23,8 @@ import org.usb4java.LibUsb; public final class DescriptorUtils { /** Mapping from USB class id to USB class name. */ - private static final Map CLASS_NAMES = new HashMap(); + private static final Map CLASS_NAMES = + new HashMap(); static { @@ -40,7 +41,8 @@ public final class DescriptorUtils CLASS_NAMES.put(LibUsb.CLASS_SMART_CARD, "Smart Card"); CLASS_NAMES.put(LibUsb.CLASS_CONTENT_SECURITY, "Content Security"); CLASS_NAMES.put(LibUsb.CLASS_VIDEO, "Video"); - CLASS_NAMES.put(LibUsb.CLASS_PERSONAL_HEALTHCARE, "Personal Healthcare"); + CLASS_NAMES.put(LibUsb.CLASS_PERSONAL_HEALTHCARE, + "Personal Healthcare"); CLASS_NAMES.put(LibUsb.CLASS_DIAGNOSTIC_DEVICE, "Diagnostic Device"); CLASS_NAMES.put(LibUsb.CLASS_WIRELESS, "Wireless"); CLASS_NAMES.put(LibUsb.CLASS_APPLICATION, "Application"); @@ -392,6 +394,7 @@ public final class DescriptorUtils * @return The direction name. */ public static String getDirectionName(final byte bEndpointAddress) { - return ((bEndpointAddress & LibUsb.ENDPOINT_IN) == 0) ? ("OUT") : ("IN"); + return ((bEndpointAddress & LibUsb.ENDPOINT_IN) == 0) ? + ("OUT") : ("IN"); } }