commit 3d322f41e52faa27408aaf98ce001d4bc04c2bce
author Pavlin Radoslavov <pavlin@onlab.us> Mon Aug 18 14:58:55 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:20 2014 -0700
tree 4ec02d05bc43b1f7a9f45e6dc5743820bb06b4af
parent 5317ac9f3dd606a52160a165d4078ab95f64e98e

Removed obsolete methods SwitchPort.dpid() and SwitchPort.port()

Instead, always use the equivalent SwitchPort.getDpid() and
SwitchPort.getPortNumber()

No functional changes.

Change-Id: Ia654bb4b1e2c2f7582307f5b0d2c83dd60405525

src/main/java/net/onrc/onos/api/flowmanager/FlowLink.java

diff --git a/src/main/java/net/onrc/onos/api/flowmanager/FlowLink.java b/src/main/java/net/onrc/onos/api/flowmanager/FlowLink.java
index 59bcb98..42b7788 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/FlowLink.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/FlowLink.java
@@ -56,7 +56,7 @@
      * @return The source switch DPID.
      */
     public Dpid getSrcDpid() {
-        return srcSwitchPort.dpid();
+        return srcSwitchPort.getDpid();
     }
 
     /**
@@ -65,7 +65,7 @@
      * @return The source port number at the source switch.
      */
     public PortNumber getSrcPortNumber() {
-        return srcSwitchPort.port();
+        return srcSwitchPort.getPortNumber();
     }
 
     /**
@@ -83,7 +83,7 @@
      * @return The destination switch DPID.
      */
     public Dpid getDstDpid() {
-        return dstSwitchPort.dpid();
+        return dstSwitchPort.getDpid();
     }
 
     /**
@@ -92,7 +92,7 @@
      * @return The destination port number at the destination switch.
      */
     public PortNumber getDstPortNumber() {
-        return dstSwitchPort.port();
+        return dstSwitchPort.getPortNumber();
     }
 
     @Override

src/main/java/net/onrc/onos/api/flowmanager/Tree.java

diff --git a/src/main/java/net/onrc/onos/api/flowmanager/Tree.java b/src/main/java/net/onrc/onos/api/flowmanager/Tree.java
index 1e161a2..a6d0e89 100644
--- a/src/main/java/net/onrc/onos/api/flowmanager/Tree.java
+++ b/src/main/java/net/onrc/onos/api/flowmanager/Tree.java
@@ -64,10 +64,10 @@
 
     private void addPort(SwitchPort port) {
         checkNotNull(port);
-        if (!ports.containsKey(port.dpid())) {
-            ports.put(port.dpid(), new HashSet<PortNumber>());
+        if (!ports.containsKey(port.getDpid())) {
+            ports.put(port.getDpid(), new HashSet<PortNumber>());
         }
-        ports.get(port.dpid()).add(port.port());
+        ports.get(port.getDpid()).add(port.getPortNumber());
     }
 
     /**