commit 6cc8645f932a1b85741e2209f480dfbb7f405372
author Simon Hunt <simon@onlab.us> Thu Apr 27 17:46:22 2017 -0700
committer Simon Hunt <simon@onlab.us> Fri Apr 28 06:59:42 2017 +0000
tree 37259938fffa889a479f6db0b59f99b6210612fe
parent 4f56bbd82905e316b57be30b543158e6fb1f368a

ONOS-6258: UiTopo2Overlay et al.
- revert DriverMatrix app.
- simplify overlay base class to be consistent with classic topo
- add topo2overlay and topo2traffic (skeleton code for now)

Change-Id: I88fda4d7b75807bd08637d846a869846a364c1f8

web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java

diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
index 02d0808..6bab13e 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/UiExtensionManager.java
@@ -50,12 +50,14 @@
 import org.onosproject.ui.UiExtensionService;
 import org.onosproject.ui.UiMessageHandlerFactory;
 import org.onosproject.ui.UiPreferencesService;
+import org.onosproject.ui.UiTopo2OverlayFactory;
 import org.onosproject.ui.UiTopoMap;
 import org.onosproject.ui.UiTopoMapFactory;
 import org.onosproject.ui.UiTopoOverlayFactory;
 import org.onosproject.ui.UiView;
 import org.onosproject.ui.UiViewHidden;
 import org.onosproject.ui.impl.topo.Topo2ViewMessageHandler;
+import org.onosproject.ui.impl.topo.Traffic2Overlay;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -172,6 +174,11 @@
                         new ProtectedIntentOverlay()
                 );
 
+        UiTopo2OverlayFactory topo2OverlayFactory =
+                () -> ImmutableList.of(
+                        new Traffic2Overlay()
+                );
+
         UiTopoMapFactory topoMapFactory =
                 () -> ImmutableList.of(
                         new UiTopoMap("australia", "Australia", "*australia", 1.0),
@@ -194,6 +201,7 @@
         return new UiExtension.Builder(CL, coreViews)
                 .messageHandlerFactory(messageHandlerFactory)
                 .topoOverlayFactory(topoOverlayFactory)
+                .topo2OverlayFactory(topo2OverlayFactory)
                 .topoMapFactory(topoMapFactory)
                 .resourcePath(CORE)
                 .build();
@@ -202,11 +210,11 @@
     @Activate
     public void activate() {
         Serializer serializer = Serializer.using(KryoNamespaces.API,
-                ObjectNode.class, ArrayNode.class,
-                JsonNodeFactory.class, LinkedHashMap.class,
-                TextNode.class, BooleanNode.class,
-                LongNode.class, DoubleNode.class, ShortNode.class,
-                IntNode.class, NullNode.class);
+                     ObjectNode.class, ArrayNode.class,
+                     JsonNodeFactory.class, LinkedHashMap.class,
+                     TextNode.class, BooleanNode.class,
+                     LongNode.class, DoubleNode.class, ShortNode.class,
+                     IntNode.class, NullNode.class);
 
         prefsConsistentMap = storageService.<String, ObjectNode>consistentMapBuilder()
                 .withName(ONOS_USER_PREFERENCES)