Brian O'Connor

Refactoring LabelResourceManager to use ListenerRegistry

Change-Id: I65b6225b3b6f06c76ccb65d29da93ec11c179d1b
...@@ -11,8 +11,8 @@ import org.apache.felix.scr.annotations.Deactivate; ...@@ -11,8 +11,8 @@ import org.apache.felix.scr.annotations.Deactivate;
11 import org.apache.felix.scr.annotations.Reference; 11 import org.apache.felix.scr.annotations.Reference;
12 import org.apache.felix.scr.annotations.ReferenceCardinality; 12 import org.apache.felix.scr.annotations.ReferenceCardinality;
13 import org.apache.felix.scr.annotations.Service; 13 import org.apache.felix.scr.annotations.Service;
14 -import org.onosproject.event.AbstractListenerRegistry;
15 import org.onosproject.event.EventDeliveryService; 14 import org.onosproject.event.EventDeliveryService;
15 +import org.onosproject.event.ListenerRegistry;
16 import org.onosproject.net.Device; 16 import org.onosproject.net.Device;
17 import org.onosproject.net.DeviceId; 17 import org.onosproject.net.DeviceId;
18 import org.onosproject.net.device.DeviceEvent; 18 import org.onosproject.net.device.DeviceEvent;
...@@ -53,8 +53,8 @@ public class LabelResourceManager ...@@ -53,8 +53,8 @@ public class LabelResourceManager
53 private final Logger log = getLogger(getClass()); 53 private final Logger log = getLogger(getClass());
54 private final LabelResourceDelegate delegate = new InternalLabelResourceDelegate(); 54 private final LabelResourceDelegate delegate = new InternalLabelResourceDelegate();
55 55
56 - private final AbstractListenerRegistry<LabelResourceEvent, LabelResourceListener> listenerRegistry 56 + private final ListenerRegistry<LabelResourceEvent, LabelResourceListener> listenerRegistry
57 - = new AbstractListenerRegistry<>(); 57 + = new ListenerRegistry<>();
58 58
59 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 59 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
60 protected LabelResourceStore store; 60 protected LabelResourceStore store;
......