commit 195af6e6b27c23c7beb98f4cd425e7d7ffff1ecd
author Madan Jampani <madan@onlab.us> Thu Oct 09 15:01:17 2014 -0700
committer Madan Jampani <madan@onlab.us> Thu Oct 09 15:01:17 2014 -0700
tree 238f0d96b4474f9a706be4f6af8f101e2caa0ea6
parent da147db72e9f6b8dff55ae50e298648a00033a76

Refactored code in an attempt to break dependency cycles

core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java

diff --git a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
index fb579ea..d8b3160 100644
--- a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java
@@ -24,10 +24,10 @@
 import org.onlab.onos.net.Device;
 import org.onlab.onos.net.Device.Type;
 import org.onlab.onos.net.DeviceId;
-import org.onlab.onos.net.MastershipRole;
 import org.onlab.onos.net.Port;
 import org.onlab.onos.net.PortNumber;
 import org.onlab.onos.net.device.DeviceListener;
+import org.onlab.onos.net.device.DeviceMastershipRole;
 import org.onlab.onos.net.device.DeviceService;
 import org.onlab.onos.net.flow.CompletedBatchOperation;
 import org.onlab.onos.net.flow.DefaultFlowEntry;
@@ -364,7 +364,7 @@
         }
 
         @Override
-        public MastershipRole getRole(DeviceId deviceId) {
+        public DeviceMastershipRole getRole(DeviceId deviceId) {
             return null;
         }