ONOS-2186 - GUI Topo Overlay - (WIP)
- moved TopoUtils, NodeSelection, BiLink and Map (and Base derivatives) to core API.
Change-Id: I105f6df6508b1597ffde19fe7e360d3775abf250
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BaseLink.java b/core/api/src/main/java/org/onosproject/ui/topo/BaseLink.java
similarity index 93%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/BaseLink.java
rename to core/api/src/main/java/org/onosproject/ui/topo/BaseLink.java
index 043b471..c37c129 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BaseLink.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/BaseLink.java
@@ -15,11 +15,10 @@
*
*/
-package org.onosproject.ui.impl.topo;
+package org.onosproject.ui.topo;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
-import org.onosproject.ui.topo.LinkHighlight;
/**
* A simple concrete implementation of a {@link BiLink}.
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BaseLinkMap.java b/core/api/src/main/java/org/onosproject/ui/topo/BaseLinkMap.java
similarity index 95%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/BaseLinkMap.java
rename to core/api/src/main/java/org/onosproject/ui/topo/BaseLinkMap.java
index 14c66ea..720eca4 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BaseLinkMap.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/BaseLinkMap.java
@@ -15,7 +15,7 @@
*
*/
-package org.onosproject.ui.impl.topo;
+package org.onosproject.ui.topo;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BiLink.java b/core/api/src/main/java/org/onosproject/ui/topo/BiLink.java
similarity index 96%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/BiLink.java
rename to core/api/src/main/java/org/onosproject/ui/topo/BiLink.java
index 8ccf543..8c95e15 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BiLink.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/BiLink.java
@@ -15,11 +15,10 @@
*
*/
-package org.onosproject.ui.impl.topo;
+package org.onosproject.ui.topo;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
-import org.onosproject.ui.topo.LinkHighlight;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BiLinkMap.java b/core/api/src/main/java/org/onosproject/ui/topo/BiLinkMap.java
similarity index 98%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/BiLinkMap.java
rename to core/api/src/main/java/org/onosproject/ui/topo/BiLinkMap.java
index 18565d7..66f0f8f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/BiLinkMap.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/BiLinkMap.java
@@ -15,7 +15,7 @@
*
*/
-package org.onosproject.ui.impl.topo;
+package org.onosproject.ui.topo;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/NodeSelection.java b/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
similarity index 98%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/NodeSelection.java
rename to core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
index c0597aa..cefbf03 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/NodeSelection.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/NodeSelection.java
@@ -15,7 +15,7 @@
*
*/
-package org.onosproject.ui.impl.topo;
+package org.onosproject.ui.topo;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/TopoUtils.java b/core/api/src/main/java/org/onosproject/ui/topo/TopoUtils.java
similarity index 98%
rename from web/gui/src/main/java/org/onosproject/ui/impl/topo/TopoUtils.java
rename to core/api/src/main/java/org/onosproject/ui/topo/TopoUtils.java
index d43b376..f92d579 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/TopoUtils.java
+++ b/core/api/src/main/java/org/onosproject/ui/topo/TopoUtils.java
@@ -15,7 +15,7 @@
*
*/
-package org.onosproject.ui.impl.topo;
+package org.onosproject.ui.topo;
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/LinkViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/LinkViewMessageHandler.java
index c182180..7de6d62 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/LinkViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/LinkViewMessageHandler.java
@@ -22,8 +22,8 @@
import org.onosproject.net.link.LinkService;
import org.onosproject.ui.RequestHandler;
import org.onosproject.ui.UiMessageHandler;
-import org.onosproject.ui.impl.topo.BaseLink;
-import org.onosproject.ui.impl.topo.BaseLinkMap;
+import org.onosproject.ui.topo.BaseLink;
+import org.onosproject.ui.topo.BaseLinkMap;
import org.onosproject.ui.table.TableModel;
import org.onosproject.ui.table.TableRequestHandler;
import org.onosproject.ui.table.cell.ConnectPointFormatter;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
index 923c3db..57054e0 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TopologyViewMessageHandler.java
@@ -57,7 +57,7 @@
import org.onosproject.ui.RequestHandler;
import org.onosproject.ui.UiConnection;
import org.onosproject.ui.impl.TrafficMonitor.Mode;
-import org.onosproject.ui.impl.topo.NodeSelection;
+import org.onosproject.ui.topo.NodeSelection;
import org.onosproject.ui.topo.Highlights;
import org.onosproject.ui.topo.PropertyPanel;
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 130f88f..6f3577f 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
@@ -96,7 +96,7 @@
import static org.onosproject.net.host.HostEvent.Type.HOST_REMOVED;
import static org.onosproject.net.link.LinkEvent.Type.LINK_ADDED;
import static org.onosproject.net.link.LinkEvent.Type.LINK_REMOVED;
-import static org.onosproject.ui.impl.topo.TopoUtils.compactLinkString;
+import static org.onosproject.ui.topo.TopoUtils.compactLinkString;
import static org.onosproject.ui.topo.TopoConstants.CoreButtons;
import static org.onosproject.ui.topo.TopoConstants.Properties;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java b/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java
index cea5899..39beb0b 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/TrafficMonitor.java
@@ -35,9 +35,9 @@
import org.onosproject.net.intent.PathIntent;
import org.onosproject.net.statistic.Load;
import org.onosproject.ui.impl.topo.IntentSelection;
-import org.onosproject.ui.impl.topo.NodeSelection;
+import org.onosproject.ui.topo.NodeSelection;
import org.onosproject.ui.impl.topo.ServicesBundle;
-import org.onosproject.ui.impl.topo.TopoUtils;
+import org.onosproject.ui.topo.TopoUtils;
import org.onosproject.ui.impl.topo.TopoIntentFilter;
import org.onosproject.ui.impl.topo.TrafficClass;
import org.onosproject.ui.impl.topo.TrafficLink;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java
index ae7eab4..f99ff7c 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/IntentSelection.java
@@ -18,6 +18,7 @@
package org.onosproject.ui.impl.topo;
import org.onosproject.net.intent.Intent;
+import org.onosproject.ui.topo.NodeSelection;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLink.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLink.java
index e83f9fc..a0e1662 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLink.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLink.java
@@ -20,8 +20,10 @@
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
import org.onosproject.net.statistic.Load;
+import org.onosproject.ui.topo.BiLink;
import org.onosproject.ui.topo.LinkHighlight;
import org.onosproject.ui.topo.LinkHighlight.Flavor;
+import org.onosproject.ui.topo.TopoUtils;
import static org.onosproject.ui.topo.LinkHighlight.Flavor.NO_HIGHLIGHT;
import static org.onosproject.ui.topo.LinkHighlight.Flavor.PRIMARY_HIGHLIGHT;
diff --git a/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLinkMap.java b/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLinkMap.java
index 59965ad..081964f 100644
--- a/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLinkMap.java
+++ b/web/gui/src/main/java/org/onosproject/ui/impl/topo/TrafficLinkMap.java
@@ -19,6 +19,7 @@
import org.onosproject.net.Link;
import org.onosproject.net.LinkKey;
+import org.onosproject.ui.topo.BiLinkMap;
/**
* Collection of {@link TrafficLink}s.