Move classes from support package to main package and make them package

private
This commit is contained in:
Klaus Reimer 2013-04-13 11:42:31 +02:00
parent 21e57b9375
commit cac3c42af0
12 changed files with 11 additions and 27 deletions

View File

@ -34,7 +34,6 @@ import de.ailis.usb4java.libusb.Device;
import de.ailis.usb4java.libusb.DeviceHandle;
import de.ailis.usb4java.libusb.LibUSB;
import de.ailis.usb4java.libusb.LibUsbException;
import de.ailis.usb4java.support.UsbDeviceListenerList;
/**
* A Usb device.

View File

@ -12,7 +12,6 @@ import javax.usb.UsbException;
import javax.usb.UsbHostManager;
import javax.usb.UsbIrp;
import de.ailis.usb4java.support.Config;
/**
* Abstract base class for IRP queues.

View File

@ -3,7 +3,7 @@
* See LICENSE.txt for licensing information.
*/
package de.ailis.usb4java.support;
package de.ailis.usb4java;
import java.util.Collections;
import java.util.HashSet;
@ -15,7 +15,7 @@ import java.util.Set;
*
* @author Klaus Reimer (k@ailis.de)
*/
public final class Config
final class Config
{
/** Base key name for properties. */
private static final String KEY_BASE = "de.ailis.usb4java.";
@ -50,7 +50,7 @@ public final class Config
* @param properties
* The properties to read the configuration from.
*/
public Config(final Properties properties)
Config(final Properties properties)
{
// Read scanHierarchy property. If not set then hierarchy scan is
// disabled on Mac OS X (because libusb always returns a null root_dev

View File

@ -16,7 +16,6 @@ import javax.usb.event.UsbDeviceDataEvent;
import de.ailis.usb4java.libusb.DeviceHandle;
import de.ailis.usb4java.libusb.LibUSB;
import de.ailis.usb4java.libusb.LibUsbException;
import de.ailis.usb4java.support.UsbDeviceListenerList;
/**
* A queue for USB control I/O request packets.

View File

@ -3,7 +3,7 @@
* See LICENSE.txt for licensing information.
*/
package de.ailis.usb4java.support;
package de.ailis.usb4java;
import java.util.ArrayList;
import java.util.Collections;
@ -17,7 +17,7 @@ import java.util.List;
* @param <T>
* The event listener type.
*/
public abstract class EventListenerList<T extends EventListener>
abstract class EventListenerList<T extends EventListener>
{
/** The list with registered listeners. */
private final List<T> listeners = Collections

View File

@ -23,7 +23,6 @@ import javax.usb.event.UsbPipeListener;
import javax.usb.util.DefaultUsbControlIrp;
import javax.usb.util.DefaultUsbIrp;
import de.ailis.usb4java.support.UsbPipeListenerList;
/**
* usb4java implementation of UsbPipe.

View File

@ -20,7 +20,6 @@ import javax.usb.event.UsbDeviceListener;
import javax.usb.util.DefaultUsbControlIrp;
import de.ailis.usb4java.descriptors.SimpleUsbDeviceDescriptor;
import de.ailis.usb4java.support.UsbDeviceListenerList;
/**
* The virtual USB root hub.

View File

@ -15,8 +15,6 @@ import javax.usb.event.UsbServicesListener;
import de.ailis.usb4java.libusb.Loader;
import de.ailis.usb4java.libusb.LoaderException;
import de.ailis.usb4java.support.Config;
import de.ailis.usb4java.support.UsbServicesListenerList;
/**
* usb4java implementation of JSR-80 UsbServices.

View File

@ -3,7 +3,7 @@
* See LICENSE.txt for licensing information.
*/
package de.ailis.usb4java.support;
package de.ailis.usb4java;
import javax.usb.event.UsbDeviceDataEvent;
import javax.usb.event.UsbDeviceErrorEvent;
@ -15,7 +15,7 @@ import javax.usb.event.UsbDeviceListener;
*
* @author Klaus Reimer (k@ailis.de)
*/
public final class UsbDeviceListenerList extends
final class UsbDeviceListenerList extends
EventListenerList<UsbDeviceListener> implements UsbDeviceListener
{
@Override

View File

@ -3,7 +3,7 @@
* See LICENSE.txt for licensing information.
*/
package de.ailis.usb4java.support;
package de.ailis.usb4java;
import javax.usb.event.UsbPipeDataEvent;
import javax.usb.event.UsbPipeErrorEvent;
@ -14,7 +14,7 @@ import javax.usb.event.UsbPipeListener;
*
* @author Klaus Reimer (k@ailis.de)
*/
public final class UsbPipeListenerList extends
final class UsbPipeListenerList extends
EventListenerList<UsbPipeListener> implements UsbPipeListener
{
@Override

View File

@ -3,7 +3,7 @@
* See LICENSE.txt for licensing information.
*/
package de.ailis.usb4java.support;
package de.ailis.usb4java;
import javax.usb.event.UsbServicesEvent;
import javax.usb.event.UsbServicesListener;
@ -13,7 +13,7 @@ import javax.usb.event.UsbServicesListener;
*
* @author Klaus Reimer (k@ailis.de)
*/
public final class UsbServicesListenerList extends
final class UsbServicesListenerList extends
EventListenerList<UsbServicesListener> implements UsbServicesListener
{
@Override

View File

@ -1,9 +0,0 @@
/*
* Copyright (C) 2013 Klaus Reimer <k@ailis.de>
* See LICENSE.txt for licensing information.
*/
/**
* Support classes.
*/
package de.ailis.usb4java.support;