Merge "Follow javadoc convention"
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
index e0c8c78..ac75147 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java
@@ -60,6 +60,7 @@
 
         /**
          * Matches an inport.
+         *
          * @param port the inport
          * @return a selection builder
          */
@@ -67,6 +68,7 @@
 
         /**
          * Matches a l2 src address.
+         *
          * @param addr a l2 address
          * @return a selection builder
          */
@@ -74,6 +76,7 @@
 
         /**
          * Matches a l2 dst address.
+         *
          * @param addr a l2 address
          * @return a selection builder
          */
@@ -81,6 +84,7 @@
 
         /**
          * Matches the ethernet type.
+         *
          * @param ethType an ethernet type
          * @return a selection builder
          */
@@ -88,6 +92,7 @@
 
         /**
          * Matches the vlan id.
+         *
          * @param vlanId a vlan id
          * @return a selection builder
          */
@@ -95,6 +100,7 @@
 
         /**
          * Matches a vlan priority.
+         *
          * @param vlanPcp a vlan priority
          * @return a selection builder
          */
@@ -102,6 +108,7 @@
 
         /**
          * Matches the l3 protocol.
+         *
          * @param proto a l3 protocol
          * @return a selection builder
          */
@@ -109,6 +116,7 @@
 
         /**
          * Matches a l3 address.
+         *
          * @param ip a l3 address
          * @return a selection builder
          */
@@ -116,6 +124,7 @@
 
         /**
          * Matches a l3 address.
+         *
          * @param ip a l3 address
          * @return a selection builder
          */
@@ -123,6 +132,7 @@
 
         /**
          * Matches a TCP source port number.
+         *
          * @param tcpPort a TCP source port number
          * @return a selection builder
          */
@@ -130,6 +140,7 @@
 
         /**
          * Matches a TCP destination port number.
+         *
          * @param tcpPort a TCP destination port number
          * @return a selection builder
          */
@@ -137,6 +148,7 @@
 
         /**
          * Matches an optical signal ID or lambda.
+         *
          * @param lambda lamda
          * @return a selection builder
          */
@@ -144,6 +156,7 @@
 
         /**
          * Matches an optical Signal Type.
+         *
          * @param signalType signalType
          * @return a selection builder
          */
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java
index 20447ed..bbecae0 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java
@@ -42,6 +42,7 @@
 
         /**
          * Adds an instruction to the builder.
+         *
          * @param instruction an instruction
          * @return a treatment builder
          */
@@ -54,6 +55,7 @@
 
         /**
          * Set the output port.
+         *
          * @param number the out port
          * @return a treatment builder
          */
@@ -61,6 +63,7 @@
 
         /**
          * Sets the src l2 address.
+         *
          * @param addr a macaddress
          * @return a treatment builder
          */
@@ -68,6 +71,7 @@
 
         /**
          * Sets the dst l2 address.
+         *
          * @param addr a macaddress
          * @return a treatment builder
          */
@@ -75,6 +79,7 @@
 
         /**
          * Sets the vlan id.
+         *
          * @param id a vlanid
          * @return a treatment builder
          */
@@ -82,6 +87,7 @@
 
         /**
          * Sets the vlan priority.
+         *
          * @param pcp a vlan priority
          * @return a treatment builder
          */
@@ -89,6 +95,7 @@
 
         /**
          * Sets the src l3 address.
+         *
          * @param addr an ip
          * @return a treatment builder
          */
@@ -96,6 +103,7 @@
 
         /**
          * Sets the dst l3 address.
+         *
          * @param addr an ip
          * @return a treatment builder
          */
@@ -103,6 +111,7 @@
 
         /**
          * Sets the optical channel ID or lambda.
+         *
          * @param lambda optical channel ID
          * @return a treatment builder
          */