commit fb564502676f7f6d86b167abde4c2b57393319bf
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Jun 16 21:29:00 2014 -0700
committer Gerrit Code Review <gerrit2@gerrit.onos.onlab.us> Wed Jun 25 16:46:22 2014 -0700
tree 17e7fbc11a0abf7ff21f86023a3907ff4d68137e
parent d83844d039b6c2a134096aed2d6ef52e9e4343ab

Rename Port to PortNumber

Current util.Port actually only represent a port number.
Renaming it to PortNumber, so that it matches what it actually reprsent.

- Updated javadoc
- Removed unnecessary hashCode calculation
- Hide default constructor from public

Change-Id: Ib26c746eaa27464356c4ca0abff6af5e321afc35

src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java

diff --git a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
index bd41a95..b27e0fd 100644
--- a/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
+++ b/src/main/java/net/onrc/onos/core/flowprogrammer/FlowPusher.java
@@ -43,7 +43,7 @@
 import net.onrc.onos.core.util.FlowEntryUserState;
 import net.onrc.onos.core.util.IPv4Net;
 import net.onrc.onos.core.util.Pair;
-import net.onrc.onos.core.util.Port;
+import net.onrc.onos.core.util.PortNumber;
 
 import org.openflow.protocol.OFBarrierReply;
 import org.openflow.protocol.OFBarrierRequest;
@@ -668,7 +668,7 @@
         match.setWildcards(OFMatch.OFPFW_ALL);
 
         // Match the Incoming Port
-        Port matchInPort = flowEntryMatch.inPort();
+        PortNumber matchInPort = flowEntryMatch.inPort();
         if (matchInPort != null) {
             match.setInputPort(matchInPort.value());
             match.setWildcards(match.getWildcards() & ~OFMatch.OFPFW_IN_PORT);
@@ -904,7 +904,7 @@
         final FlowEntryMatch flowEntryMatch = flowEntry.flowEntryMatch();
         final OFMatch match = computeMatch(flowEntryMatch);
 
-        final Port matchInPort = flowEntryMatch.inPort();
+        final PortNumber matchInPort = flowEntryMatch.inPort();
         final MACAddress matchSrcMac = flowEntryMatch.srcMac();
         final MACAddress matchDstMac = flowEntryMatch.dstMac();