commit d40483d52cf793c0f0fe047dd0a4ebfe01857d6e
author Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:20:30 2014 -0700
committer Yuta HIGUCHI <y-higuchi@onlab.us> Thu Oct 09 15:28:45 2014 -0700
tree 7c201fc35f8059c79a1f4906475a21e7c37674dd
parent 74be6c43dfa3c0a062cceb2dcd3f04e4f57b4eb5

Revert "Refactored code in an attempt to break dependency cycles"

This reverts commit 195af6e6b27c23c7beb98f4cd425e7d7ffff1ecd.

core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java

diff --git a/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java b/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
index c30ee3e..53fafd3 100644
--- a/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
+++ b/core/api/src/test/java/org/onlab/onos/cluster/MastershipServiceAdapter.java
@@ -1,8 +1,8 @@
 package org.onlab.onos.cluster;
 
 import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.MastershipRole;
 import org.onlab.onos.net.device.DeviceMastershipListener;
-import org.onlab.onos.net.device.DeviceMastershipRole;
 import org.onlab.onos.net.device.DeviceMastershipService;
 import org.onlab.onos.net.device.DeviceMastershipTermService;
 
@@ -13,12 +13,12 @@
  */
 public class MastershipServiceAdapter implements DeviceMastershipService {
     @Override
-    public DeviceMastershipRole getLocalRole(DeviceId deviceId) {
+    public MastershipRole getLocalRole(DeviceId deviceId) {
         return null;
     }
 
     @Override
-    public DeviceMastershipRole requestRoleFor(DeviceId deviceId) {
+    public MastershipRole requestRoleFor(DeviceId deviceId) {
         return null;
     }