From cac3c42af073e8791e9baa0d2d9735e5b7f2efe5 Mon Sep 17 00:00:00 2001 From: Klaus Reimer Date: Sat, 13 Apr 2013 11:42:31 +0200 Subject: [PATCH] Move classes from support package to main package and make them package private --- src/main/java/de/ailis/usb4java/AbstractDevice.java | 1 - src/main/java/de/ailis/usb4java/AbstractIrpQueue.java | 1 - .../java/de/ailis/usb4java/{support => }/Config.java | 6 +++--- src/main/java/de/ailis/usb4java/ControlIrpQueue.java | 1 - .../ailis/usb4java/{support => }/EventListenerList.java | 4 ++-- src/main/java/de/ailis/usb4java/Pipe.java | 1 - src/main/java/de/ailis/usb4java/RootHub.java | 1 - src/main/java/de/ailis/usb4java/Services.java | 2 -- .../usb4java/{support => }/UsbDeviceListenerList.java | 4 ++-- .../usb4java/{support => }/UsbPipeListenerList.java | 4 ++-- .../usb4java/{support => }/UsbServicesListenerList.java | 4 ++-- .../java/de/ailis/usb4java/support/package-info.java | 9 --------- 12 files changed, 11 insertions(+), 27 deletions(-) rename src/main/java/de/ailis/usb4java/{support => }/Config.java (97%) rename src/main/java/de/ailis/usb4java/{support => }/EventListenerList.java (93%) rename src/main/java/de/ailis/usb4java/{support => }/UsbDeviceListenerList.java (93%) rename src/main/java/de/ailis/usb4java/{support => }/UsbPipeListenerList.java (92%) rename src/main/java/de/ailis/usb4java/{support => }/UsbServicesListenerList.java (91%) delete mode 100644 src/main/java/de/ailis/usb4java/support/package-info.java diff --git a/src/main/java/de/ailis/usb4java/AbstractDevice.java b/src/main/java/de/ailis/usb4java/AbstractDevice.java index 8319976..d53d270 100644 --- a/src/main/java/de/ailis/usb4java/AbstractDevice.java +++ b/src/main/java/de/ailis/usb4java/AbstractDevice.java @@ -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. diff --git a/src/main/java/de/ailis/usb4java/AbstractIrpQueue.java b/src/main/java/de/ailis/usb4java/AbstractIrpQueue.java index 2ac9264..23bf431 100644 --- a/src/main/java/de/ailis/usb4java/AbstractIrpQueue.java +++ b/src/main/java/de/ailis/usb4java/AbstractIrpQueue.java @@ -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. diff --git a/src/main/java/de/ailis/usb4java/support/Config.java b/src/main/java/de/ailis/usb4java/Config.java similarity index 97% rename from src/main/java/de/ailis/usb4java/support/Config.java rename to src/main/java/de/ailis/usb4java/Config.java index f0fc925..4b20a34 100644 --- a/src/main/java/de/ailis/usb4java/support/Config.java +++ b/src/main/java/de/ailis/usb4java/Config.java @@ -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 diff --git a/src/main/java/de/ailis/usb4java/ControlIrpQueue.java b/src/main/java/de/ailis/usb4java/ControlIrpQueue.java index 3a2a034..5a5a4b3 100644 --- a/src/main/java/de/ailis/usb4java/ControlIrpQueue.java +++ b/src/main/java/de/ailis/usb4java/ControlIrpQueue.java @@ -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. diff --git a/src/main/java/de/ailis/usb4java/support/EventListenerList.java b/src/main/java/de/ailis/usb4java/EventListenerList.java similarity index 93% rename from src/main/java/de/ailis/usb4java/support/EventListenerList.java rename to src/main/java/de/ailis/usb4java/EventListenerList.java index 2d670ac..cdb7391 100644 --- a/src/main/java/de/ailis/usb4java/support/EventListenerList.java +++ b/src/main/java/de/ailis/usb4java/EventListenerList.java @@ -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 * The event listener type. */ -public abstract class EventListenerList +abstract class EventListenerList { /** The list with registered listeners. */ private final List listeners = Collections diff --git a/src/main/java/de/ailis/usb4java/Pipe.java b/src/main/java/de/ailis/usb4java/Pipe.java index bc7c56b..8662208 100644 --- a/src/main/java/de/ailis/usb4java/Pipe.java +++ b/src/main/java/de/ailis/usb4java/Pipe.java @@ -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. diff --git a/src/main/java/de/ailis/usb4java/RootHub.java b/src/main/java/de/ailis/usb4java/RootHub.java index c198a10..d3d7231 100644 --- a/src/main/java/de/ailis/usb4java/RootHub.java +++ b/src/main/java/de/ailis/usb4java/RootHub.java @@ -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. diff --git a/src/main/java/de/ailis/usb4java/Services.java b/src/main/java/de/ailis/usb4java/Services.java index 5b9f997..a656ba8 100644 --- a/src/main/java/de/ailis/usb4java/Services.java +++ b/src/main/java/de/ailis/usb4java/Services.java @@ -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. diff --git a/src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java b/src/main/java/de/ailis/usb4java/UsbDeviceListenerList.java similarity index 93% rename from src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java rename to src/main/java/de/ailis/usb4java/UsbDeviceListenerList.java index 210eac0..81e7772 100644 --- a/src/main/java/de/ailis/usb4java/support/UsbDeviceListenerList.java +++ b/src/main/java/de/ailis/usb4java/UsbDeviceListenerList.java @@ -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 implements UsbDeviceListener { @Override diff --git a/src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java b/src/main/java/de/ailis/usb4java/UsbPipeListenerList.java similarity index 92% rename from src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java rename to src/main/java/de/ailis/usb4java/UsbPipeListenerList.java index 4619430..ae258f3 100644 --- a/src/main/java/de/ailis/usb4java/support/UsbPipeListenerList.java +++ b/src/main/java/de/ailis/usb4java/UsbPipeListenerList.java @@ -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 implements UsbPipeListener { @Override diff --git a/src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java b/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java similarity index 91% rename from src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java rename to src/main/java/de/ailis/usb4java/UsbServicesListenerList.java index 6cd3e01..05c9187 100644 --- a/src/main/java/de/ailis/usb4java/support/UsbServicesListenerList.java +++ b/src/main/java/de/ailis/usb4java/UsbServicesListenerList.java @@ -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 implements UsbServicesListener { @Override diff --git a/src/main/java/de/ailis/usb4java/support/package-info.java b/src/main/java/de/ailis/usb4java/support/package-info.java deleted file mode 100644 index f766c1f..0000000 --- a/src/main/java/de/ailis/usb4java/support/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -/* - * Copyright (C) 2013 Klaus Reimer - * See LICENSE.txt for licensing information. - */ - -/** - * Support classes. - */ -package de.ailis.usb4java.support;