commit d8fd2f54639bd71334ec21211e3e2d014d626168
author Yuta HIGUCHI <y-higuchi@onlab.us> Mon Sep 01 23:19:45 2014 -0700
committer Saurav Das <sauravdas@alumni.stanford.edu> Fri Sep 05 11:47:26 2014 -0700
tree ecfa417c4e0232914b1a1b3b51a5aac4402534bb
parent 04f16a6eb8d32667176441c42581571c458bc73b

Rename MastershipEvent -> MastershipData

Change-Id: I24a290d65972cad0eaa1a1e687dc00adf5890cce

src/main/java/net/onrc/onos/core/topology/TopologyImpl.java

diff --git a/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java b/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java
index c27a247..2ceb2d9 100644
--- a/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java
+++ b/src/main/java/net/onrc/onos/core/topology/TopologyImpl.java
@@ -49,7 +49,7 @@
 
     // Mastership info
     // Dpid -> [ (InstanceID, Role) ]
-    private final Map<Dpid, SortedSet<MastershipEvent>> mastership;
+    private final Map<Dpid, SortedSet<MastershipData>> mastership;
 
     // DPID -> Switch
     private final ConcurrentMap<Dpid, SwitchData> switches;
@@ -93,7 +93,7 @@
         try {
             // shallow copy Set in Map
             this.mastership = new HashMap<>(original.mastership.size());
-            for (Entry<Dpid, SortedSet<MastershipEvent>> e
+            for (Entry<Dpid, SortedSet<MastershipData>> e
                         : original.mastership.entrySet()) {
                 this.mastership.put(e.getKey(), new TreeSet<>(e.getValue()));
             }
@@ -514,11 +514,11 @@
 
     @Override
     public OnosInstanceId getSwitchMaster(Dpid dpid) {
-        final SortedSet<MastershipEvent> candidates = mastership.get(dpid);
+        final SortedSet<MastershipData> candidates = mastership.get(dpid);
         if (candidates == null) {
             return null;
         }
-        for (MastershipEvent candidate : candidates) {
+        for (MastershipData candidate : candidates) {
             if (candidate.getRole() == Role.MASTER) {
                 return candidate.getOnosInstanceId();
             }
@@ -718,18 +718,18 @@
     /**
      * Puts a mastership change event.
      *
-     * @param master MastershipEvent
+     * @param master MastershipData
      */
     @GuardedBy("writeLock")
-    protected void putSwitchMastershipEvent(MastershipEvent master) {
+    protected void putSwitchMastershipData(MastershipData master) {
         checkNotNull(master);
 
-        SortedSet<MastershipEvent> candidates
+        SortedSet<MastershipData> candidates
             = mastership.get(master.getDpid());
         if (candidates == null) {
-            // SortedSet, customized so that MASTER MastershipEvent appear
+            // SortedSet, customized so that MASTER MastershipData appear
             // earlier during iteration.
-            candidates = new TreeSet<>(new MastershipEvent.MasterFirstComparator());
+            candidates = new TreeSet<>(new MastershipData.MasterFirstComparator());
         }
 
         // always replace
@@ -741,15 +741,15 @@
      * Removes a mastership change event.
      * <p>
      * Note: Only Dpid and OnosInstanceId will be used to identify the
-     * {@link MastershipEvent} to remove.
+     * {@link MastershipData} to remove.
      *
-     * @param master {@link MastershipEvent} to remove. (Role is ignored)
+     * @param master {@link MastershipData} to remove. (Role is ignored)
      */
     @GuardedBy("writeLock")
-    protected void removeSwitchMastershipEvent(MastershipEvent master) {
+    protected void removeSwitchMastershipData(MastershipData master) {
         checkNotNull(master);
 
-        SortedSet<MastershipEvent> candidates
+        SortedSet<MastershipData> candidates
             = mastership.get(master.getDpid());
         if (candidates == null) {
             // nothing to do