Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode: [4153] trunk/core/src/driver/org/jnode/driver
|
From: <ls...@us...> - 2008-05-30 12:20:47
|
Revision: 4153
http://jnode.svn.sourceforge.net/jnode/?rev=4153&view=rev
Author: lsantha
Date: 2008-05-30 05:20:45 -0700 (Fri, 30 May 2008)
Log Message:
-----------
Checkstyle fixes.
Modified Paths:
--------------
trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java
trunk/core/src/driver/org/jnode/driver/ApiNotFoundException.java
trunk/core/src/driver/org/jnode/driver/Bus.java
trunk/core/src/driver/org/jnode/driver/DefaultDeviceManager.java
trunk/core/src/driver/org/jnode/driver/Device.java
trunk/core/src/driver/org/jnode/driver/DeviceAPI.java
trunk/core/src/driver/org/jnode/driver/DeviceAlreadyConnectedException.java
trunk/core/src/driver/org/jnode/driver/DeviceAlreadyRegisteredException.java
trunk/core/src/driver/org/jnode/driver/DeviceException.java
trunk/core/src/driver/org/jnode/driver/DeviceFinder.java
trunk/core/src/driver/org/jnode/driver/DeviceFinderPlugin.java
trunk/core/src/driver/org/jnode/driver/DeviceInfoAPI.java
trunk/core/src/driver/org/jnode/driver/DeviceListener.java
trunk/core/src/driver/org/jnode/driver/DeviceManager.java
trunk/core/src/driver/org/jnode/driver/DeviceManagerListener.java
trunk/core/src/driver/org/jnode/driver/DeviceNotFoundException.java
trunk/core/src/driver/org/jnode/driver/DeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/DeviceUtils.java
trunk/core/src/driver/org/jnode/driver/Driver.java
trunk/core/src/driver/org/jnode/driver/DriverException.java
trunk/core/src/driver/org/jnode/driver/DriverPermission.java
trunk/core/src/driver/org/jnode/driver/DriverPlugin.java
trunk/core/src/driver/org/jnode/driver/InvalidDriverException.java
trunk/core/src/driver/org/jnode/driver/RemovableDeviceAPI.java
trunk/core/src/driver/org/jnode/driver/bus/firewire/FireWireBus.java
trunk/core/src/driver/org/jnode/driver/bus/firewire/FireWireDevice.java
trunk/core/src/driver/org/jnode/driver/bus/firewire/FireWireDriver.java
trunk/core/src/driver/org/jnode/driver/bus/pci/AGPCapability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/AbstractPCIDeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/bus/pci/Capability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/CompactHotSwapCapability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/DeviceDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/pci/MSICapability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIBaseAddress.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIBus.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIBusAPI.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIClassToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIConstants.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIDescriptors.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIDevice.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIDeviceConfig.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIDeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIDriver.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIException.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIFinder.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIHeaderType0.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIHeaderType1.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIHeaderType2.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCIRomAddress.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PCI_IDs.java
trunk/core/src/driver/org/jnode/driver/bus/pci/PMCapability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/SlotIDCapability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/VPDCapability.java
trunk/core/src/driver/org/jnode/driver/bus/pci/VendorDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/pcmcia/CardBusBus.java
trunk/core/src/driver/org/jnode/driver/bus/pcmcia/CardBusDevice.java
trunk/core/src/driver/org/jnode/driver/bus/pcmcia/CardBusDriver.java
trunk/core/src/driver/org/jnode/driver/bus/smbus/DIMM.java
trunk/core/src/driver/org/jnode/driver/bus/smbus/DIMMDriver.java
trunk/core/src/driver/org/jnode/driver/bus/smbus/SMBus.java
trunk/core/src/driver/org/jnode/driver/bus/smbus/SMBusControler.java
trunk/core/src/driver/org/jnode/driver/bus/smbus/SMBusDevice.java
trunk/core/src/driver/org/jnode/driver/bus/usb/AbstractDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/AbstractDeviceItem.java
trunk/core/src/driver/org/jnode/driver/bus/usb/AbstractHostControllerDriver.java
trunk/core/src/driver/org/jnode/driver/bus/usb/ConfigurationDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/DeviceDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/EndPointDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/InterfaceDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/SetupPacket.java
trunk/core/src/driver/org/jnode/driver/bus/usb/StringDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/StringDescriptorZero.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBBus.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBConfiguration.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBConstants.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBControlPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBDataPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBDevice.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBEndPoint.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBException.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBHostControllerAPI.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBHubAPI.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBHubMonitor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBInterface.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBPacket.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBPipeListener.java
trunk/core/src/driver/org/jnode/driver/bus/usb/USBRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/hub/HubDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/hub/PortStatus.java
trunk/core/src/driver/org/jnode/driver/bus/usb/hub/USBHubConstants.java
trunk/core/src/driver/org/jnode/driver/bus/usb/hub/USBHubDeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/bus/usb/hub/USBHubDriver.java
trunk/core/src/driver/org/jnode/driver/bus/usb/spi/AbstractUSBControlRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/spi/AbstractUSBDataRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/spi/AbstractUSBRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/AbstractStructure.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/AbstractTreeStructure.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/FrameList.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/QueueHead.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/Schedule.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/TransferDescriptor.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIConstants.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIControlPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIControlRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCICore.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDataPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDataRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIDriver.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIIO.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipe.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIPipeManager.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIRequest.java
trunk/core/src/driver/org/jnode/driver/bus/usb/uhci/UHCIRootHub.java
trunk/core/src/driver/org/jnode/driver/character/ChannelAlreadyOwnedException.java
trunk/core/src/driver/org/jnode/driver/character/CharacterDeviceAPI.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i440BXDeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ACPI.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ACPI_SMBusControler.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_ISABridge.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82371AB_USBController.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82443BX_HostPCIBridge.java
trunk/core/src/driver/org/jnode/driver/chipset/i440BX/i82443BX_PCIPCIBridge.java
trunk/core/src/driver/org/jnode/driver/chipset/via/Via82C686.java
trunk/core/src/driver/org/jnode/driver/chipset/via/Via8363_0.java
trunk/core/src/driver/org/jnode/driver/chipset/via/ViaDeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/chipset/via/ViaQuirks.java
trunk/core/src/driver/org/jnode/driver/console/CommandHistory.java
trunk/core/src/driver/org/jnode/driver/console/CompletionInfo.java
trunk/core/src/driver/org/jnode/driver/console/Console.java
trunk/core/src/driver/org/jnode/driver/console/ConsoleException.java
trunk/core/src/driver/org/jnode/driver/console/ConsoleInputStream.java
trunk/core/src/driver/org/jnode/driver/console/ConsoleManager.java
trunk/core/src/driver/org/jnode/driver/console/InputCompleter.java
trunk/core/src/driver/org/jnode/driver/console/InputHistory.java
trunk/core/src/driver/org/jnode/driver/console/TextConsole.java
trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsole.java
trunk/core/src/driver/org/jnode/driver/console/spi/AbstractConsoleManager.java
trunk/core/src/driver/org/jnode/driver/console/spi/ConsoleOutputStream.java
trunk/core/src/driver/org/jnode/driver/console/spi/ConsolePrintStream.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/KeyboardInputStream.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/Line.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/ScrollableTextScreenConsole.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsole.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsoleManager.java
trunk/core/src/driver/org/jnode/driver/console/textscreen/TextScreenConsolePlugin.java
trunk/core/src/driver/org/jnode/driver/input/AbstractInputDriver.java
trunk/core/src/driver/org/jnode/driver/input/AbstractKeyboardDriver.java
trunk/core/src/driver/org/jnode/driver/input/AbstractPointerDriver.java
trunk/core/src/driver/org/jnode/driver/input/DeadKeyException.java
trunk/core/src/driver/org/jnode/driver/input/Key.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardAPI.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardAPIAdapter.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardAdapter.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardConstants.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardEvent.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreter.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardInterpreterFactory.java
trunk/core/src/driver/org/jnode/driver/input/KeyboardListener.java
trunk/core/src/driver/org/jnode/driver/input/Keys.java
trunk/core/src/driver/org/jnode/driver/input/LogitechProtocol.java
trunk/core/src/driver/org/jnode/driver/input/LogitechWheelMouseProtocol.java
trunk/core/src/driver/org/jnode/driver/input/MouseInterpreter.java
trunk/core/src/driver/org/jnode/driver/input/MouseProtocolHandler.java
trunk/core/src/driver/org/jnode/driver/input/PointerAPI.java
trunk/core/src/driver/org/jnode/driver/input/PointerAPIAdapter.java
trunk/core/src/driver/org/jnode/driver/input/PointerEvent.java
trunk/core/src/driver/org/jnode/driver/input/PointerInterpreter.java
trunk/core/src/driver/org/jnode/driver/input/PointerListener.java
trunk/core/src/driver/org/jnode/driver/input/SystemListener.java
trunk/core/src/driver/org/jnode/driver/input/SystemTriggerAPI.java
trunk/core/src/driver/org/jnode/driver/input/SystemTriggerListener.java
trunk/core/src/driver/org/jnode/driver/input/UnsupportedKeyException.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_BE_fr.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_CH_fr.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_DE.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_DK.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_DV.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_ES.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_FR.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_FR_fr.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU_101.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU_hu.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_HU_hu_101.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_IT.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_IT_it.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_NO.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_SE.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_UK_en.java
trunk/core/src/driver/org/jnode/driver/input/l10n/KeyboardInterpreter_US_en.java
trunk/core/src/driver/org/jnode/driver/package.html
trunk/core/src/driver/org/jnode/driver/serial/SerialPortAPI.java
trunk/core/src/driver/org/jnode/driver/serial/SerialPortDriver.java
trunk/core/src/driver/org/jnode/driver/serial/SerialPortFinder.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiAPI.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiDeviceToDriverMapper.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiDriver.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiSystemTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/AcpiTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/DifferentiatedSystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/ExtendedSystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/FirmwareAcpiControlStructure.java
trunk/core/src/driver/org/jnode/driver/system/acpi/FixedAcpiDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/GenericAddress.java
trunk/core/src/driver/org/jnode/driver/system/acpi/RSDP.java
trunk/core/src/driver/org/jnode/driver/system/acpi/RootSystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/SystemDescriptionTable.java
trunk/core/src/driver/org/jnode/driver/system/acpi/aml/Aml.java
trunk/core/src/driver/org/jnode/driver/system/acpi/aml/AmlOpcode.java
trunk/core/src/driver/org/jnode/driver/system/acpi/aml/NameString.java
trunk/core/src/driver/org/jnode/driver/system/acpi/aml/ParseNode.java
trunk/core/src/driver/org/jnode/driver/system/acpi/aml/Parser.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/AcpiInteger.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/AcpiNamedObject.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/AcpiObject.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/Buffer.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/ByteField.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/Device.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/NameSpace.java
trunk/core/src/driver/org/jnode/driver/system/acpi/vm/Scope.java
trunk/core/src/driver/org/jnode/driver/system/cmos/CMOSConstants.java
trunk/core/src/driver/org/jnode/driver/system/cmos/CMOSService.java
trunk/core/src/driver/org/jnode/driver/system/cmos/def/CMOS.java
trunk/core/src/driver/org/jnode/driver/system/cmos/def/CMOSPlugin.java
trunk/core/src/driver/org/jnode/driver/system/cmos/def/RTC.java
trunk/core/src/driver/org/jnode/driver/system/firmware/AcpiDevice.java
trunk/core/src/driver/org/jnode/driver/system/firmware/AcpiRSDPInfo.java
trunk/core/src/driver/org/jnode/driver/system/firmware/FirmwareAPI.java
trunk/core/src/driver/org/jnode/driver/system/firmware/bios/BiosDriver.java
trunk/core/src/driver/org/jnode/driver/system/firmware/bios/BiosFinder.java
trunk/core/src/driver/org/jnode/driver/system/pnp/PnP.java
trunk/core/src/driver/org/jnode/driver/system/ram/RAMControler.java
trunk/core/src/driver/org/jnode/driver/system/ram/RAMModuleCollection.java
trunk/core/src/driver/org/jnode/driver/system/ram/RAMModuleInfo.java
trunk/core/src/driver/org/jnode/driver/textscreen/ScrollableTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/TextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/TextScreenManager.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcBufferTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/AbstractPcTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcBufferTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcScrollableTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreen.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreenManager.java
trunk/core/src/driver/org/jnode/driver/textscreen/x86/PcTextScreenPlugin.java
trunk/core/src/driver/org/jnode/driver/virtual/VirtualDevice.java
trunk/core/src/driver/org/jnode/driver/virtual/VirtualDeviceDriver.java
trunk/core/src/driver/org/jnode/driver/virtual/VirtualDeviceFactory.java
Modified: trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java 2008-05-30 11:55:43 UTC (rev 4152)
+++ trunk/core/src/driver/org/jnode/driver/AbstractDeviceManager.java 2008-05-30 12:20:45 UTC (rev 4153)
@@ -18,11 +18,10 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.driver;
import gnu.java.security.action.GetPropertyAction;
-
import java.security.AccessController;
import java.util.ArrayList;
import java.util.Collection;
@@ -32,7 +31,6 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-
import org.jnode.naming.InitialNaming;
import org.jnode.plugin.PluginException;
import org.jnode.system.BootLog;
@@ -40,46 +38,58 @@
/**
* Default device manager.
- *
+ *
* @author epr
*/
-public abstract class AbstractDeviceManager implements DeviceManager
-{
+public abstract class AbstractDeviceManager implements DeviceManager {
- /** All registered devices */
+ /**
+ * All registered devices
+ */
private final Map<String, Device> devices = new HashMap<String, Device>();
- /** All registered device to driver mappers */
+ /**
+ * All registered device to driver mappers
+ */
private final List<DeviceToDriverMapper> mappers = new ArrayList<DeviceToDriverMapper>();
- /** All registered device finders */
+ /**
+ * All registered device finders
+ */
private final List<DeviceFinder> finders = new ArrayList<DeviceFinder>();
- /** All listeners to my events */
+ /**
+ * All listeners to my events
+ */
private final List<DeviceManagerListener> listeners = new LinkedList<DeviceManagerListener>();
- /** All listeners to device events */
+ /**
+ * All listeners to device events
+ */
private final List<DeviceListener> deviceListeners = new LinkedList<DeviceListener>();
- /** The system bus */
+ /**
+ * The system bus
+ */
private final Bus systemBus;
- /** The JNode command line */
+ /**
+ * The JNode command line
+ */
private final String cmdLine;
private boolean extensionsLoaded = false;
-
+
private long defaultStartTimeout = 10000;
private long fastStartTimeout = 1000;
/**
* Create a new instance
- *
*/
public AbstractDeviceManager() {
cmdLine = (String) AccessController.doPrivileged(new GetPropertyAction(
- "jnode.cmdline", ""));
+ "jnode.cmdline", ""));
this.systemBus = new SystemBus();
}
@@ -87,7 +97,7 @@
* Returns a collection of all known devices. The collection is not
* modifiable, but the underlying collection can change, so be aware of
* exceptions in iterators.
- *
+ *
* @return All known devices.
*/
final public Collection<Device> getDevices() {
@@ -98,7 +108,7 @@
* Returns a collection of all known devices that implement the given api..
* The collection is not modifiable, but the underlying collection can
* change, so be aware of exceptions in iterators.
- *
+ *
* @param apiClass
* @return All known devices the implement the given api.
*/
@@ -114,15 +124,16 @@
/**
* Gets the device with the given ID.
- *
+ *
* @param id
* @return The device with the given id
- * @throws DeviceNotFoundException
- * No device with the given id was found.
+ * @throws DeviceNotFoundException No device with the given id was found.
*/
final public Device getDevice(String id) throws DeviceNotFoundException {
final Device device = devices.get(id);
- if (device == null) { throw new DeviceNotFoundException(id); }
+ if (device == null) {
+ throw new DeviceNotFoundException(id);
+ }
return device;
}
@@ -138,13 +149,14 @@
* </ul>
* Note that if the device already has a driver connected to it, the first
* two steps are ignored.
- *
+ *
* @param device
* @throws DeviceAlreadyRegisteredException
+ *
* @throws DriverException
*/
final public void register(Device device)
- throws DeviceAlreadyRegisteredException, DriverException {
+ throws DeviceAlreadyRegisteredException, DriverException {
boolean shouldStart;
@@ -175,17 +187,20 @@
/**
* Actually register the device. The device is not started, nor is the
* registered event fired.
- *
+ *
* @param device
+ * @return true if the device should be tried to start.
* @throws DeviceAlreadyRegisteredException
+ *
* @throws DriverException
- * @return true if the device should be tried to start.
*/
private synchronized final boolean doRegister(Device device)
- throws DeviceAlreadyRegisteredException, DriverException {
+ throws DeviceAlreadyRegisteredException, DriverException {
final String devID = device.getId();
- if (devices.containsKey(devID)) { throw new DeviceAlreadyRegisteredException(
- devID); }
+ if (devices.containsKey(devID)) {
+ throw new DeviceAlreadyRegisteredException(
+ devID);
+ }
// Set a link to me
device.setManager(this);
// Find a driver if needed
@@ -209,7 +224,7 @@
/**
* Unregister a device. The device will be stopped and removed from the
* namespace.
- *
+ *
* @param device
* @throws DriverException
*/
@@ -231,14 +246,13 @@
/**
* Start a given device. The device must have been registered.
- *
+ *
* @param device
- * @throws DeviceNotFoundException
- * The device has not been registered.
+ * @throws DeviceNotFoundException The device has not been registered.
* @throws DriverException
*/
final public void start(Device device) throws DeviceNotFoundException,
- DriverException {
+ DriverException {
// Make sure the device exists.
getDevice(device.getId());
// Start it (if needed)
@@ -251,10 +265,10 @@
sw.stop();
if (sw.isElapsedLongerThen(defaultStartTimeout)) {
BootLog.error("Device startup took " + sw + ": "
- + device.getId());
+ + device.getId());
} else if (sw.isElapsedLongerThen(fastStartTimeout)) {
BootLog.info("Device startup took " + sw + ": "
- + device.getId());
+ + device.getId());
}
BootLog.debug("Started " + device.getId());
} catch (DriverException ex) {
@@ -269,14 +283,13 @@
/**
* Stop a given device. The device must have been registered.
- *
+ *
* @param device
- * @throws DeviceNotFoundException
- * The device has not been registered.
+ * @throws DeviceNotFoundException The device has not been registered.
* @throws DriverException
*/
final public void stop(Device device) throws DeviceNotFoundException,
- DriverException {
+ DriverException {
// Make sure the device exists.
getDevice(device.getId());
// Stop it
@@ -289,14 +302,15 @@
/**
* Rename a device, optionally using an autonumber postfix
- *
+ *
* @param device
* @param name
* @param autonumber
* @throws DeviceAlreadyRegisteredException
+ *
*/
final public synchronized void rename(Device device, String name,
- boolean autonumber) throws DeviceAlreadyRegisteredException {
+ boolean autonumber) throws DeviceAlreadyRegisteredException {
if (!device.getId().startsWith(name)) {
String newId;
if (autonumber) {
@@ -310,8 +324,10 @@
newId = name;
}
- if (devices.containsKey(newId)) { throw new DeviceAlreadyRegisteredException(
- newId); }
+ if (devices.containsKey(newId)) {
+ throw new DeviceAlreadyRegisteredException(
+ newId);
+ }
// Remove the old id
if (devices.remove(device.getId()) != null) {
// Add the new id
@@ -324,7 +340,7 @@
/**
* Add a listener
- *
+ *
* @param listener
*/
final public void addListener(DeviceManagerListener listener) {
@@ -335,7 +351,7 @@
/**
* Add a listener
- *
+ *
* @param listener
*/
final public void removeListener(DeviceManagerListener listener) {
@@ -346,7 +362,7 @@
/**
* Add a device listener
- *
+ *
* @param listener
*/
final public void addListener(DeviceListener listener) {
@@ -357,7 +373,7 @@
/**
* Add a device listener
- *
+ *
* @param listener
*/
final public void removeListener(DeviceListener listener) {
@@ -385,7 +401,7 @@
/**
* Gets the system bus. The system bus is the root of all hardware busses
* and devices connected to these busses.
- *
+ *
* @return The system bus
*/
final public Bus getSystemBus() {
@@ -425,8 +441,8 @@
final protected void findDevices() throws InterruptedException {
waitUntilExtensionsLoaded();
final ArrayList<DeviceFinder> finders;
- synchronized( this ) {
- finders = new ArrayList<DeviceFinder>( this.finders );
+ synchronized (this) {
+ finders = new ArrayList<DeviceFinder>(this.finders);
}
for (DeviceFinder finder : finders) {
try {
@@ -435,16 +451,16 @@
BootLog.error("Error while trying to find system devices", ex);
} catch (RuntimeException ex) {
BootLog
- .error(
- "Runtime exception while trying to find system devices",
- ex);
+ .error(
+ "Runtime exception while trying to find system devices",
+ ex);
}
}
}
/**
* Search for a suitable driver for the given device.
- *
+ *
* @param device
* @return The first suitable driver for the given device, or a NullDriver
* if no suitable driver has been found.
@@ -454,38 +470,40 @@
for (DeviceToDriverMapper mapper : mappers) {
final Driver drv = mapper.findDriver(device);
if (drv != null) {
- //Syslog.debug("Found driver for " + device);
- return drv; }
+ //Syslog.debug("Found driver for " + device);
+ return drv;
+ }
}
}
BootLog.debug("No driver found for " + device
- + " delaying device startup");
+ + " delaying device startup");
return null;
}
/**
* Start this manager
- *
+ *
* @throws PluginException
*/
abstract public void start() throws PluginException;
-
+
final protected synchronized void loadExtensions() {
refreshFinders(finders);
- refreshMappers(mappers);
+ refreshMappers(mappers);
extensionsLoaded = true;
notifyAll();
}
- final private synchronized void waitUntilExtensionsLoaded() throws IllegalMonitorStateException, InterruptedException {
+ final private synchronized void waitUntilExtensionsLoaded()
+ throws IllegalMonitorStateException, InterruptedException {
while (!extensionsLoaded) {
wait();
}
}
-
+
/**
* Stop this manager
- *
+ *
* @throws PluginException
*/
final public void stop() throws PluginException {
@@ -495,7 +513,7 @@
/**
* Fire a deviceRegistered event to all my listeners
- *
+ *
* @param device
*/
protected final void fireRegisteredEvent(Device device) {
@@ -509,14 +527,14 @@
l.deviceRegistered(device);
if (sw.isElapsedLongerThen(100)) {
BootLog.error("DeviceManagerListener took " + sw
- + " in deviceRegistered: " + l.getClass().getName());
+ + " in deviceRegistered: " + l.getClass().getName());
}
}
}
/**
* Fire a deviceUnregister event to all my listeners
- *
+ *
* @param device
*/
protected final void fireUnregisterEvent(Device device) {
@@ -530,14 +548,14 @@
l.deviceUnregister(device);
if (sw.isElapsedLongerThen(100)) {
BootLog.error("DeviceManagerListener took " + sw
- + " in deviceUnregister: " + l.getClass().getName());
+ + " in deviceUnregister: " + l.getClass().getName());
}
}
}
/**
* Fire a device started event to all the device listeners
- *
+ *
* @param device
*/
final public void fireStartedEvent(Device device) {
@@ -551,14 +569,14 @@
l.deviceStarted(device);
if (sw.isElapsedLongerThen(100)) {
BootLog.error("DeviceListener (in manager) took " + sw
- + " in deviceStarted: " + l.getClass().getName());
+ + " in deviceStarted: " + l.getClass().getName());
}
}
}
/**
* Fire a device stop event to all the device listeners
- *
+ *
* @param device
*/
public final void fireStopEvent(Device device) {
@@ -572,26 +590,28 @@
l.deviceStop(device);
if (sw.isElapsedLongerThen(100)) {
BootLog.error("DeviceListener (in manager) took " + sw
- + " in deviceStop: " + l.getClass().getName());
+ + " in deviceStop: " + l.getClass().getName());
}
}
}
/**
* Refresh the list of finders, based on the mappers extension-point.
+ *
* @param finders
*/
abstract protected void refreshFinders(List<DeviceFinder> finders);
/**
- * Refresh the list of mappers, based on the mappers extension-point.
+ * Refresh the list of mappers, based on the mappers extension-point.
+ *
* @param mappers
*/
abstract protected void refreshMappers(List<DeviceToDriverMapper> mappers);
-
+
/**
* The root bus of every system.
- *
+ *
* @author Ewout Prangsma (ep...@us...)
*/
static class SystemBus extends Bus {
@@ -600,7 +620,7 @@
/**
* Comparator used to sort DeviceToDriverMapper's.
- *
+ *
* @author Ewout Prangsma (ep...@us...)
*/
protected static class MapperComparator implements Comparator<DeviceToDriverMapper> {
@@ -610,8 +630,8 @@
/**
* @param o1
* @param o2
+ * @return int
* @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- * @return int
*/
public int compare(DeviceToDriverMapper o1, DeviceToDriverMapper o2) {
final DeviceToDriverMapper m1 = (DeviceToDriverMapper) o1;
@@ -631,7 +651,7 @@
/**
* Gets the default timeout for device startup.
- *
+ *
* @return Returns the defaultStartTimeout.
*/
public final long getDefaultStartTimeout() {
@@ -640,9 +660,8 @@
/**
* Sets the default timeout for device startup.
- *
- * @param defaultStartTimeout
- * The defaultStartTimeout to set.
+ *
+ * @param defaultStartTimeout The defaultStartTimeout to set.
*/
public final void setDefaultStartTimeout(long defaultStartTimeout) {
this.defaultStartTimeout = defaultStartTimeout;
Modified: trunk/core/src/driver/org/jnode/driver/ApiNotFoundException.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/ApiNotFoundException.java 2008-05-30 11:55:43 UTC (rev 4152)
+++ trunk/core/src/driver/org/jnode/driver/ApiNotFoundException.java 2008-05-30 12:20:45 UTC (rev 4153)
@@ -18,42 +18,42 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.driver;
/**
* API has not been found exception.
- *
+ *
* @author Ewout Prangsma (ep...@us...)
*/
public class ApiNotFoundException extends DeviceException {
- /**
- *
- */
- public ApiNotFoundException() {
- super();
- }
+ /**
+ *
+ */
+ public ApiNotFoundException() {
+ super();
+ }
- /**
- * @param message
- * @param cause
- */
- public ApiNotFoundException(String message, Throwable cause) {
- super(message, cause);
- }
+ /**
+ * @param message
+ * @param cause
+ */
+ public ApiNotFoundException(String message, Throwable cause) {
+ super(message, cause);
+ }
- /**
- * @param cause
- */
- public ApiNotFoundException(Throwable cause) {
- super(cause);
- }
+ /**
+ * @param cause
+ */
+ public ApiNotFoundException(Throwable cause) {
+ super(cause);
+ }
- /**
- * @param s
- */
- public ApiNotFoundException(String s) {
- super(s);
- }
+ /**
+ * @param s
+ */
+ public ApiNotFoundException(String s) {
+ super(s);
+ }
}
Modified: trunk/core/src/driver/org/jnode/driver/Bus.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/Bus.java 2008-05-30 11:55:43 UTC (rev 4152)
+++ trunk/core/src/driver/org/jnode/driver/Bus.java 2008-05-30 12:20:45 UTC (rev 4153)
@@ -18,65 +18,73 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.driver;
/**
- * A software representation of a hardware bus that has
+ * A software representation of a hardware bus that has
* devices connected to it.
*
- * @see org.jnode.driver.Device
* @author Ewout Prangsma (ep...@us...)
+ * @see org.jnode.driver.Device
*/
public abstract class Bus {
- /** My parent, or null if I'm the system bus */
- private final Bus parent;
- /** The device that is connected to the parent bus and "provides" this bus. This can be null. */
- private final Device parentDevice;
+ /**
+ * My parent, or null if I'm the system bus
+ */
+ private final Bus parent;
+ /**
+ * The device that is connected to the parent bus and "provides" this bus. This can be null.
+ */
+ private final Device parentDevice;
- /**
- * Package protected initializer for the system bus.
- */
- Bus() {
- this.parent = null;
- this.parentDevice = null;
- }
+ /**
+ * Package protected initializer for the system bus.
+ */
+ Bus() {
+ this.parent = null;
+ this.parentDevice = null;
+ }
- /**
- * Initialize a new bus.
- * @param parent
- */
- public Bus(Bus parent) {
- this.parent = parent;
- this.parentDevice = null;
- }
-
- /**
- * Initialize a new bus.
- * @param parent
- */
- public Bus(Device parent) {
- this.parent = parent.getBus();
- this.parentDevice = parent;
- }
-
- /**
- * Gets the parent of this bus, or null if this is the system bus.
- * @return The parent
- */
- public final Bus getParent() {
- return this.parent;
- }
+ /**
+ * Initialize a new bus.
+ *
+ * @param parent
+ */
+ public Bus(Bus parent) {
+ this.parent = parent;
+ this.parentDevice = null;
+ }
- /**
- * Gets the device that is connected to the parent bus
- * and "provides" this bus.
- * This can be null.
- * @return The parent device
- */
- public final Device getParentDevice() {
- return this.parentDevice;
- }
+ /**
+ * Initialize a new bus.
+ *
+ * @param parent
+ */
+ public Bus(Device parent) {
+ this.parent = parent.getBus();
+ this.parentDevice = parent;
+ }
+ /**
+ * Gets the parent of this bus, or null if this is the system bus.
+ *
+ * @return The parent
+ */
+ public final Bus getParent() {
+ return this.parent;
+ }
+
+ /**
+ * Gets the device that is connected to the parent bus
+ * and "provides" this bus.
+ * This can be null.
+ *
+ * @return The parent device
+ */
+ public final Device getParentDevice() {
+ return this.parentDevice;
+ }
+
}
Modified: trunk/core/src/driver/org/jnode/driver/DefaultDeviceManager.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/DefaultDeviceManager.java 2008-05-30 11:55:43 UTC (rev 4152)
+++ trunk/core/src/driver/org/jnode/driver/DefaultDeviceManager.java 2008-05-30 12:20:45 UTC (rev 4153)
@@ -18,16 +18,14 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.driver;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
import java.util.Collections;
import java.util.List;
-
import javax.naming.NamingException;
-
import org.jnode.naming.InitialNaming;
import org.jnode.plugin.ConfigurationElement;
import org.jnode.plugin.Extension;
@@ -44,7 +42,7 @@
* @author epr
*/
public final class DefaultDeviceManager extends AbstractDeviceManager
- implements ExtensionPointListener {
+ implements ExtensionPointListener {
/**
* finder extension-point
@@ -125,7 +123,7 @@
for (int i = 0; i < extensions.length; i++) {
final Extension ext = extensions[i];
final ConfigurationElement[] elements = ext
- .getConfigurationElements();
+ .getConfigurationElements();
for (int j = 0; j < elements.length; j++) {
configureFinder(finders, elements[j]);
}
@@ -146,7 +144,7 @@
for (int i = 0; i < extensions.length; i++) {
final Extension ext = extensions[i];
final ConfigurationElement[] elements = ext
- .getConfigurationElements();
+ .getConfigurationElements();
for (int j = 0; j < elements.length; j++) {
configureMapper(mappers, elements[j]);
}
@@ -176,7 +174,7 @@
if (className != null) {
try {
final Class cls = Thread.currentThread()
- .getContextClassLoader().loadClass(className);
+ .getContextClassLoader().loadClass(className);
final DeviceFinder finder = (DeviceFinder) cls.newInstance();
finders.add(finder);
} catch (ClassNotFoundException ex) {
@@ -187,7 +185,7 @@
BootLog.error("Cannot instantiate finder class " + className);
} catch (ClassCastException ex) {
BootLog.error("Finder class " + className
- + " does not implement the DeviceFinder interface");
+ + " does not implement the DeviceFinder interface");
}
}
}
@@ -212,7 +210,7 @@
if (className != null) {
try {
final Class cls = Thread.currentThread()
- .getContextClassLoader().loadClass(className);
+ .getContextClassLoader().loadClass(className);
final DeviceToDriverMapper mapper = newMapperInstance(cls, element);
mappers.add(mapper);
} catch (ClassNotFoundException ex) {
@@ -223,7 +221,7 @@
BootLog.error("Cannot instantiate mapper class " + className, ex);
} catch (ClassCastException ex) {
BootLog
- .error("Mapper class "
+ .error("Mapper class "
+ className
+ " does not implement the DeviceToDriverMapper interface");
}
@@ -243,7 +241,8 @@
* @throws InstantiationException
* @throws IllegalAccessException
*/
- private DeviceToDriverMapper newMapperInstance(Class cls, ConfigurationElement element) throws InstantiationException, IllegalAccessException {
+ private DeviceToDriverMapper newMapperInstance(Class cls, ConfigurationElement element)
+ throws InstantiationException, IllegalAccessException {
try {
final Constructor c = cls.getConstructor(new Class[]{ConfigurationElement.class});
try {
Modified: trunk/core/src/driver/org/jnode/driver/Device.java
===================================================================
--- trunk/core/src/driver/org/jnode/driver/Device.java 2008-05-30 11:55:43 UTC (rev 4152)
+++ trunk/core/src/driver/org/jnode/driver/Device.java 2008-05-30 12:20:45 UTC (rev 4153)
@@ -18,335 +18,349 @@
* along with this library; If not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-
+
package org.jnode.driver;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Set;
-
import org.jnode.system.BootLog;
import org.jnode.system.ResourceOwner;
import org.jnode.util.StopWatch;
/**
* A software representation of a hardware device.
- *
+ * <p/>
* Every device is controlled by a Driver. These drivers are found by DeviceToDriverMapper
* instances.
- *
+ *
+ * @author Ewout Prangsma (ep...@us...)
* @see org.jnode.driver.Driver
* @see org.jnode.driver.DeviceToDriverMapper
- * @author Ewout Prangsma (ep...@us...)
*/
public class Device implements ResourceOwner {
- /** The bus that i'm connected to */
- private final Bus bus;
- /** My driver */
- private Driver driver;
- /** My identifier */
- private String id;
- /** Has this device been started? */
- private boolean started = false;
- /** The API's implemented by this device */
- private final HashMap<Class<? extends DeviceAPI>, DeviceAPI> apis = new HashMap<Class<? extends DeviceAPI>, DeviceAPI>();
- /** My listeners */
- private final ArrayList<DeviceListener> listeners = new ArrayList<DeviceListener>();
- /** The manager */
- private AbstractDeviceManager manager;
+ /**
+ * The bus that i'm connected to
+ */
+ private final Bus bus;
+ /**
+ * My driver
+ */
+ private Driver driver;
+ /**
+ * My identifier
+ */
+ private String id;
+ /**
+ * Has this device been started?
+ */
+ private boolean started = false;
+ /**
+ * The API's implemented by this device
+ */
+ private final HashMap<Class<? extends DeviceAPI>, DeviceAPI> apis =
+ new HashMap<Class<? extends DeviceAPI>, DeviceAPI>();
+ /**
+ * My listeners
+ */
+ private final ArrayList<DeviceListener> listeners = new ArrayList<DeviceListener>();
+ /**
+ * The manager
+ */
+ private AbstractDeviceManager manager;
- /**
- * Create a new instance
- *
- * @param bus
- * @param id
- */
- public Device(Bus bus, String id) {
- this.id = id;
- this.bus = bus;
- }
+ /**
+ * Create a new instance
+ *
+ * @param bus
+ * @param id
+ */
+ public Device(Bus bus, String id) {
+ this.id = id;
+ this.bus = bus;
+ }
- /**
- * Gets the driver of this device.
- * @return My driver, can be null
- */
- public final Driver getDriver() {
- return driver;
- }
+ /**
+ * Gets the driver of this device.
+ *
+ * @return My driver, can be null
+ */
+ public final Driver getDriver() {
+ return driver;
+ }
- /**
- * Gets the classname of my driver.
- * @return String can be null.
- */
- public final String getDriverClassName() {
- final Driver driver = this.driver;
- if (driver != null) {
- return driver.getClass().getName();
- } else {
- return null;
- }
- }
+ /**
+ * Gets the classname of my driver.
+ *
+ * @return String can be null.
+ */
+ public final String getDriverClassName() {
+ final Driver driver = this.driver;
+ if (driver != null) {
+ return driver.getClass().getName();
+ } else {
+ return null;
+ }
+ }
- /**
- * Gets the bus this device is connected to.
- *
- * @return My parent bus
- */
- public final Bus getBus() {
- return this.bus;
- }
+ /**
+ * Gets the bus this device is connected to.
+ *
+ * @return My parent bus
+ */
+ public final Bus getBus() {
+ return this.bus;
+ }
- /**
- * @param driver
- * @see org.jnode.driver.Device#setDriver(org.jnode.driver.Driver)
- * @throws DriverException
- */
- public void setDriver(Driver driver) throws DriverException {
- try {
- driver.connect(this);
- this.driver = driver;
- } catch (DriverException ex) {
- this.driver = null;
- throw new DriverException("Cannot set driver", ex);
- }
- }
+ /**
+ * @param driver
+ * @throws DriverException
+ * @see org.jnode.driver.Device#setDriver(org.jnode.driver.Driver)
+ */
+ public void setDriver(Driver driver) throws DriverException {
+ try {
+ driver.connect(this);
+ this.driver = driver;
+ } catch (DriverException ex) {
+ this.driver = null;
+ throw new DriverException("Cannot set driver", ex);
+ }
+ }
- /**
- * @see org.jnode.driver.Device#getId()
- * @return The id of this device
- */
- public final String getId() {
- return id;
- }
+ /**
+ * @return The id of this device
+ * @see org.jnode.driver.Device#getId()
+ */
+ public final String getId() {
+ return id;
+ }
- /**
- * Change the id of this device, only called by devicemanager
- *
- * @param newId
- */
- final void setId(String newId) {
- this.id = newId;
- }
+ /**
+ * Change the id of this device, only called by devicemanager
+ *
+ * @param newId
+ */
+ final void setId(String newId) {
+ this.id = newId;
+ }
- /**
- * Start this device.
- *
- * @throws DriverException
- */
- final void start() throws DriverException {
- if (driver == null) {
- throw new DriverException("Cannot start without a driver");
- } else if (manager == null) {
- throw new DriverException("Cannot start without being registered");
- } else if (!started) {
- // Let extensions do their start work
- onStartDevice();
- // Let the driver start me
- driver.startDevice();
- // I'm started
- started = true;
- // Notify my listeners
- fireStartedEvent();
- }
- }
+ /**
+ * Start this device.
+ *
+ * @throws DriverException
+ */
+ final void start() throws DriverException {
+ if (driver == null) {
+ throw new DriverException("Cannot start without a driver");
+ } else if (manager == null) {
+ throw new DriverException("Cannot start without being registered");
+ } else if (!started) {
+ // Let extensions do their start work
+ onStartDevice();
+ // Let the driver start me
+ driver.startDevice();
+ // I'm started
+ started = true;
+ // Notify my listeners
+ fireStartedEvent();
+ }
+ }
- /**
- * Start this device.
- *
- * @throws DriverException
- */
- final void stop(boolean unsetDriver) throws DriverException {
- if (driver == null) {
- throw new DriverException("Cannot stop without a driver");
- } else if (manager == null) {
- throw new DriverException("Cannot stop without being registered");
- } else if (started) {
- // Notify my listeners
- fireStopEvent();
- // Let the driver stop me
- driver.stopDevice();
- // Let extensions do their stop work
- onStopDevice();
- // Remove the driver connection if requested
- if (unsetDriver) {
- this.driver = null;
- }
- // I'm stopped now.
- started = false;
- }
- }
+ /**
+ * Start this device.
+ *
+ * @throws DriverException
+ */
+ final void stop(boolean unsetDriver) throws DriverException {
+ if (driver == null) {
+ throw new DriverException("Cannot stop without a driver");
+ } else if (manager == null) {
+ throw new DriverException("Cannot stop without being registered");
+ } else if (started) {
+ // Notify my listeners
+ fireStopEvent();
+ // Let the driver stop me
+ driver.stopDevice();
+ // Let extensions do their stop work
+ onStopDevice();
+ // Remove the driver connection if requested
+ if (unsetDriver) {
+ this.driver = null;
+ }
+ // I'm stopped now.
+ started = false;
+ }
+ }
- /**
- * Has this device been started?
- *
- * @return boolean
- */
- public final boolean isStarted() {
- return started;
- }
+ /**
+ * Has this device been started?
+ *
+ * @return boolean
+ */
+ public final boolean isStarted() {
+ return started;
+ }
- /**
- * Add an API implementation to the list of API's implemented by this device.
- *
- * @param apiInterface
- * @param apiImplementation
- */
- public final <T extends DeviceAPI> void registerAPI(Class<T> apiInterface, T apiImplementation) {
- if (!apiInterface.isInstance(apiImplementation)) {
- throw new IllegalArgumentException("API implementation does not implement API interface");
- }
- if (!apiInterface.isInterface()) {
- throw new IllegalArgumentException("API interface must be an interface");
- }
- apis.put(apiInterface, apiImplementation);
- final Class[] interfaces = apiInterface.getInterfaces();
- if (interfaces != null) {
+ /**
+ * Add an API implementation to the list of API's implemented by this device.
+ *
+ * @param apiInterface
+ * @param apiImplementation
+ */
+ public final <T extends DeviceAPI> void registerAPI(Class<T> apiInterface, T apiImplementation) {
+ if (!apiInterface.isInstance(apiImplementation)) {
+ throw new IllegalArgumentException("API implementation does not implement API interface");
+ }
+ if (!apiInterface.isInterface()) {
+ throw new IllegalArgumentException("API interface must be an interface");
+ }
+ apis.put(apiInterface, apiImplementation);
+ final Class[] interfaces = apiInterface.getInterfaces();
+ if (interfaces != null) {
for (Class intf : interfaces) {
if (DeviceAPI.class.isAssignableFrom(intf)) {
if (!apis.containsKey(intf)) {
- apis.put((Class<? extends DeviceAPI>)intf, apiImplementation);
+ apis.put((Class<? extends DeviceAPI>) intf, apiImplementation);
}
}
- }
- }
- }
+ }
+ }
+ }
- /**
- * Remove an API implementation from the list of API's implemented by this device.
- *
- * @param apiInterface
- */
- public final void unregisterAPI(Class<? extends DeviceAPI> apiInterface) {
- apis.remove(apiInterface);
- }
+ /**
+ * Remove an API implementation from the list of API's implemented by this device.
+ *
+ * @param apiInterface
+ */
+ public final void unregisterAPI(Class<? extends DeviceAPI> apiInterface) {
+ apis.remove(apiInterface);
+ }
- /**
- * Does this device implement the given API?
- *
- * @param apiInterface
- * @return boolean
- */
- public final boolean implementsAPI(Class<? extends DeviceAPI> apiInterface) {
- return apis.containsKey(apiInterface);
- }
+ /**
+ * Does this device implement the given API?
+ *
+ * @param apiInterface
+ * @return boolean
+ */
+ public final boolean implementsAPI(Class<? extends DeviceAPI> apiInterface) {
+ return apis.containsKey(apiInterface);
+ }
- /**
- * Gets all implemented API's?
- *
- * @return A set of Class instances
- */
- public final Set<Class<? extends DeviceAPI>> implementedAPIs() {
- return apis.keySet();
- }
+ /**
+ * Gets all implemented API's?
+ *
+ * @return A set of Class instances
+ */
+ public final Set<Class<? extends DeviceAPI>> implementedAPIs() {
+ return apis.keySet();
+ }
- /**
- * Gets the implementation of a given API.
- *
- * @param apiInterface
- * @return The api implementation (guaranteed not null)
- * @throws ApiNotFoundException
- * The given api has not been found
- */
- public final <T extends DeviceAPI> T getAPI(Class<T> apiInterface) throws ApiNotFoundException {
- final T impl = apiInterface.cast(apis.get(apiInterface));
- if (impl == null) {
- throw new ApiNotFoundException(apiInterface.getName());
- }
- return impl;
- }
+ /**
+ * Gets the implementation of a given API.
+ *
+ * @param apiInterface
+ * @return The api implementation (guaranteed not null)
+ * @throws ApiNotFoundException The given api has not been found
+ */
+ public final <T extends DeviceAPI> T getAPI(Class<T> apiInterface) throws ApiNotFoundException {
+ final T impl = apiInterface.cast(apis.get(apiInterface));
+ if (impl == null) {
+ throw new ApiNotFoundException(apiInterface.getName());
+ }
+ return impl;
+ }
- /**
- * Add a listener
- *
- * @param listener
- */
- public final void addListener(DeviceListener listener) {
- listeners.add(listener);
- }
+ /**
+ * Add a listener
+ *
+ * @param listener
+ */
+ public final void addListener(DeviceListener listener) {
+ listeners.add(listener);
+ }
- /**
- * Remove a listener
- *
- * @param listener
- */
- public final void removeListener(DeviceListener listener) {
- listeners.remove(listener);
- }
+ /**
+ * Remove a listener
+ *
+ * @param listener
+ */
+ public final void removeListener(DeviceListener listener) {
+ listeners.remove(listener);
+ }
- /**
- * This method is called during the start of the device. Just before the call to startDevice of
- * the connected driver.
- *
- * @throws DriverException
- */
- protected void onStartDevice() throws DriverException {
- }
+ /**
+ * This method is called during the start of the device. Just before the call to startDevice of
+ * the connected driver.
+ *
+ * @throws DriverException
+ */
+ protected void onStartDevice() throws DriverException {
+ }
- /**
- * This method is called during the stop of the device. Just after the call to stopDevice of
- * the connected driver.
- *
- * @throws DriverException
- */
- protected void onStopDevice() throws DriverException {
- }
+ /**
+ * This method is called during the stop of the device. Just after the call to stopDevice of
+ * the connected driver.
+ *
+ * @throws DriverException
+ */
+ protected void onStopDevice() throws DriverException {
+ }
- /**
- * Fire a deviceStarted event to all my listeners
- */
- protected final void fireStartedEvent() {
- final StopWatch sw = new StopWatch();
+ /**
+ * Fire a deviceStarted event to all my listeners
+ */
+ protected final void fireStartedEvent() {
+ final StopWatch sw = new StopWatch();
for (DeviceListener l : listeners) {
- sw.start();
- l.deviceStarted(this);
- if (sw.isElapsedLongerThen(100)) {
- BootLog.error("DeviceListener took " + sw + " in deviceStarted: " + l.getClass().getName());
- }
- }
- manager.fireStartedEvent(this);
- }
+ sw.start();
+ l.deviceStarted(this);
+ if (sw.isElapsedLongerThen(100)) {
+ BootLog.error("DeviceListener took " + sw + " in deviceStarted: " + l.getClass().getName());
+ }
+ }
+ manager.fireStartedEvent(this);
+ }
- /**
- * Fire a deviceStop event to all my listeners
- */
- protected final void fireStopEvent() {
- manager.fireStopEvent(this);
- final StopWatch sw = new StopWatch();
+ /**
+ * Fire a deviceStop event to all my listeners
+ */
+ protected final void fireStopEvent() {
+ manager.fireStopEvent(this);
+ final StopWatch sw = new StopWatch();
for (DeviceListener l : listeners) {
- sw.start();
- l.deviceStop(this);
- if (sw.isElapsedLongerThen(100)) {
- BootLog.error("DeviceListener took " + sw + " in deviceStop: " + l.getClass().getName());
- }
- }
- }
+ sw.start();
+ l.deviceStop(this);
+ if (sw.isElapsedLongerThen(100)) {
+ BootLog.error("DeviceListener took " + sw + " in deviceStop: " + l.getClass().getName());
+ }
+ }
+ }
- /**
- * @see org.jnode.system.ResourceOwner#getShortDescription()
- * @return The short description
- */
- public String getShortDescription() {
- return getId();
- }
+ /**
+ * @return The short description
+ * @see org.jnode.system.ResourceOwner#getShortDescription()
+ */
+ public String getShortDescription() {
+ return getId();
+ }
- /**
- * @return Returns the manager.
- */
- public final DeviceManager getManager() {
- return this.manager;
- }
+ /**
+ * @return Returns the ma...
[truncated message content] |