Adding some flesh to the simple device manager.
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventDispatchService.java b/net/api/src/main/java/org/onlab/onos/event/EventDispatchService.java
new file mode 100644
index 0000000..8df68bb
--- /dev/null
+++ b/net/api/src/main/java/org/onlab/onos/event/EventDispatchService.java
@@ -0,0 +1,8 @@
+package org.onlab.onos.event;
+
+/**
+ * Abstraction of an entity capable of accepting events to be posted and
+ * then dispatching them to the appropriate event sink.
+ */
+public interface EventDispatchService extends EventDispatcher, EventSinkBroker {
+}
diff --git a/net/api/src/main/java/org/onlab/onos/event/EventDispatcher.java b/net/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
index 8236d899..847df88 100644
--- a/net/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
+++ b/net/api/src/main/java/org/onlab/onos/event/EventDispatcher.java
@@ -6,13 +6,13 @@
* Similarly, whether the events are accepted and dispatched synchronously
* or asynchronously is unspecified as well.
*/
-public interface EventDispatcher<E extends Event> {
+public interface EventDispatcher {
/**
* Posts the specified event for dispatching.
*
* @param event event to be posted
*/
- void post(E event);
+ void post(Event event);
}
diff --git a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java b/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
index 9d8eb6a..f304398 100644
--- a/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
+++ b/net/api/src/main/java/org/onlab/onos/net/device/DeviceProviderService.java
@@ -34,17 +34,17 @@
* determine what has changed.
* <p/>
*
- * @param deviceId identity of the device
- * @param ports list of device ports
+ * @param deviceId identity of the device
+ * @param portDescriptions list of device ports
*/
- void updatePorts(DeviceId deviceId, List<PortDescription> ports);
+ void updatePorts(DeviceId deviceId, List<PortDescription> portDescriptions);
/**
* Used to notify the core about port status change of a single port.
*
- * @param deviceId identity of the device
- * @param port description of the port that changed
+ * @param deviceId identity of the device
+ * @param portDescription description of the port that changed
*/
- void portStatusChanged(DeviceId deviceId, PortDescription port);
+ void portStatusChanged(DeviceId deviceId, PortDescription portDescription);
}