Move utility classes into main package.
This commit is contained in:
parent
4d40f1d404
commit
3b7d6fcdf6
@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A generic representation of a BOS Device Capability descriptor.
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.utils;
|
||||
package org.usb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.IntBuffer;
|
||||
@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB configuration descriptor.
|
||||
|
||||
@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the Container ID descriptor.
|
||||
|
||||
@ -21,8 +21,6 @@ package org.usb4java;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.nio.ByteOrder;
|
||||
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
|
||||
/**
|
||||
* Setup packet for control transfers.
|
||||
*
|
||||
|
||||
@ -3,18 +3,12 @@
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
package org.usb4java.utils;
|
||||
package org.usb4java;
|
||||
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
import org.usb4java.ConfigDescriptor;
|
||||
import org.usb4java.DeviceDescriptor;
|
||||
import org.usb4java.EndpointDescriptor;
|
||||
import org.usb4java.InterfaceDescriptor;
|
||||
import org.usb4java.LibUsb;
|
||||
|
||||
/**
|
||||
* Utility methods used for descriptor dumps.
|
||||
*
|
||||
@ -22,8 +22,6 @@ import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB device descriptor.
|
||||
|
||||
@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB endpoint descriptor.
|
||||
|
||||
@ -22,7 +22,6 @@ import java.nio.ByteBuffer;
|
||||
|
||||
import org.apache.commons.lang3.builder.EqualsBuilder;
|
||||
import org.apache.commons.lang3.builder.HashCodeBuilder;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* A structure representing the standard USB interface descriptor.
|
||||
|
||||
@ -27,7 +27,6 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||
import java.util.concurrent.ConcurrentMap;
|
||||
|
||||
import org.apache.commons.lang3.tuple.ImmutablePair;
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
|
||||
/**
|
||||
* Static class providing the constants and functions of libusb.
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2013 Klaus Reimer <k@ailis.de>
|
||||
* See LICENSE.md for licensing information.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Utility classes providing static helper methods.
|
||||
*/
|
||||
package org.usb4java.utils;
|
||||
@ -29,7 +29,6 @@ import org.usb4java.EndpointDescriptor;
|
||||
import org.usb4java.Interface;
|
||||
import org.usb4java.InterfaceDescriptor;
|
||||
import org.usb4java.LibUsb;
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
|
||||
/**
|
||||
* Tests the device-scope methods of the {@link LibUsb} class which need a open
|
||||
|
||||
@ -37,7 +37,6 @@ import org.usb4java.Transfer;
|
||||
import org.usb4java.Usb20ExtensionDescriptor;
|
||||
import org.usb4java.Version;
|
||||
import org.usb4java.mocks.PollfdListenerMock;
|
||||
import org.usb4java.utils.BufferUtils;
|
||||
|
||||
/**
|
||||
* Tests the {@link LibUsb} class.
|
||||
|
||||
@ -11,8 +11,8 @@ import java.lang.reflect.Constructor;
|
||||
import java.nio.ByteBuffer;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.usb4java.DescriptorUtils;
|
||||
import org.usb4java.LibUsb;
|
||||
import org.usb4java.utils.DescriptorUtils;
|
||||
|
||||
/**
|
||||
* Tests the {@link DescriptorUtils} class.
|
||||
|
||||
Loading…
Reference in New Issue
Block a user