Fixed a few javadoc warnings.

@@ -33,9 +33,8 @@ public interface FlowRuleProviderService extends ProviderService<FlowRuleProvide
      * Pushes the collection of flow entries currently applied on the given
      * Pushes the collection of flow entries currently applied on the given
      * device.
      * device.
      *
      *
-     * @param deviceId device identifier
-     * @return collection of flow entries
+     * @param flowRules collection of flow rules
      */
      */
-    void pushFlowMetrics(Iterable<FlowRule> flowEntries);
+    void pushFlowMetrics(Iterable<FlowRule> flowRules);
 
 
 }
 }

@@ -31,7 +31,7 @@ public final class Criteria {
      * Creates a match on ETH_SRC field using the specified value. This value
      * Creates a match on ETH_SRC field using the specified value. This value
      * may be a wildcard mask.
      * may be a wildcard mask.
      *
      *
-     * @param macValue MAC address value or wildcard mask
+     * @param mac MAC address value or wildcard mask
      * @return match criterion
      * @return match criterion
      */
      */
     public static Criterion matchEthSrc(MacAddress mac) {
     public static Criterion matchEthSrc(MacAddress mac) {
@@ -42,7 +42,7 @@ public final class Criteria {
      * Creates a match on ETH_DST field using the specified value. This value
      * Creates a match on ETH_DST field using the specified value. This value
      * may be a wildcard mask.
      * may be a wildcard mask.
      *
      *
-     * @param macValue MAC address value or wildcard mask
+     * @param mac MAC address value or wildcard mask
      * @return match criterion
      * @return match criterion
      */
      */
     public static Criterion matchEthDst(MacAddress mac) {
     public static Criterion matchEthDst(MacAddress mac) {

@@ -5,7 +5,6 @@ import org.onlab.packet.VlanId;
 
 
 /**
 /**
  * Abstraction of a single traffic treatment step.
  * Abstraction of a single traffic treatment step.
- * @param <T> the type parameter for the instruction
  */
  */
 public abstract class L2ModificationInstruction implements Instruction {
 public abstract class L2ModificationInstruction implements Instruction {
 
 

@@ -4,7 +4,6 @@ import org.onlab.packet.IpAddress;
 
 
 /**
 /**
  * Abstraction of a single traffic treatment step.
  * Abstraction of a single traffic treatment step.
- * @param <T> the type parameter for the instruction
  */
  */
 public abstract class L3ModificationInstruction implements Instruction {
 public abstract class L3ModificationInstruction implements Instruction {
 
 

@@ -28,7 +28,7 @@
     <br>
     <br>
     <img src="doc-files/onos-subsystem.png" alt="ONOS subsystem structure"><br>
     <img src="doc-files/onos-subsystem.png" alt="ONOS subsystem structure"><br>
     For example, the device-subsystem comprises of a core
     For example, the device-subsystem comprises of a core
-    {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceManager DeviceManager},
+    {@link org.onlab.onos.net.trivial.device.impl.DeviceManager},
     which exposes a north-bound
     which exposes a north-bound
     {@link org.onlab.onos.net.device.DeviceService} through which applications or other core components
     {@link org.onlab.onos.net.device.DeviceService} through which applications or other core components
     can learn about the global infrastructure device inventory and through
     can learn about the global infrastructure device inventory and through
@@ -39,7 +39,7 @@
 </p>
 </p>
 
 
 <p>
 <p>
-    On the south-bound side, the core {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceManager DeviceManager}
+    On the south-bound side, the core {@link org.onlab.onos.net.trivial.device.impl.DeviceManager}
     exposes a {@link org.onlab.onos.net.device.DeviceProviderRegistry} through which any number of
     exposes a {@link org.onlab.onos.net.device.DeviceProviderRegistry} through which any number of
     {@link org.onlab.onos.net.device.DeviceProvider} entities can register and in turn obtain a
     {@link org.onlab.onos.net.device.DeviceProvider} entities can register and in turn obtain a
     {@link org.onlab.onos.net.device.DeviceProviderService}. Device and port information can then be
     {@link org.onlab.onos.net.device.DeviceProviderService}. Device and port information can then be
@@ -52,7 +52,7 @@
 <p>
 <p>
     Within the core, the tasks of indexing, persisting and synchronizing the
     Within the core, the tasks of indexing, persisting and synchronizing the
     global device and port state with the cluster peers falls on the
     global device and port state with the cluster peers falls on the
-    {@link org.onlab.onos.net.trivial.device.impl.SimpleDeviceStore DeviceStore}.
+    {@link org.onlab.onos.net.device.DeviceStore}.
 </p>
 </p>
 
 
 <p>
 <p>