Consolidated link list into bidirectional links. Re-ordered views. Took-out builtin views from injected html snippets.
Change-Id: I8de62b50e437ee6f49a9f2ce9ce6f26bb1e0a6a5
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
index 50e39d7..9bfc455 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandlerBase.java
@@ -719,7 +719,7 @@
}
- private BiLink addLink(Map<LinkKey, BiLink> biLinks, Link link) {
+ static BiLink addLink(Map<LinkKey, BiLink> biLinks, Link link) {
LinkKey key = canonicalLinkKey(link);
BiLink biLink = biLinks.get(key);
if (biLink != null) {
@@ -816,7 +816,7 @@
}
// Produces canonical link key, i.e. one that will match link and its inverse.
- private LinkKey canonicalLinkKey(Link link) {
+ static LinkKey canonicalLinkKey(Link link) {
String sn = link.src().elementId().toString();
String dn = link.dst().elementId().toString();
return sn.compareTo(dn) < 0 ?
@@ -824,7 +824,7 @@
}
// Representation of link and its inverse and any traffic data.
- private class BiLink {
+ static class BiLink {
public final LinkKey key;
public final Link one;
public Link two;
@@ -861,7 +861,7 @@
}
// Auxiliary key/value carrier.
- private class Prop {
+ static class Prop {
public final String key;
public final String value;
@@ -872,14 +872,14 @@
}
// Auxiliary properties separator
- private class Separator extends Prop {
+ static class Separator extends Prop {
protected Separator() {
super("-", "");
}
}
// Auxiliary carrier of data for requesting traffic message.
- protected class TrafficClass {
+ static class TrafficClass {
public final boolean showTraffic;
public final String type;
public final Iterable<Intent> intents;