Fixing GUI to bypass the new UiTopoSession code which is not ready.

Change-Id: I5bcee7897f43867fc4d6157c44420937265d488b

@@ -28,8 +28,6 @@ import org.onosproject.ui.UiExtensionService;
 import org.onosproject.ui.UiMessageHandler;
 import org.onosproject.ui.UiMessageHandler;
 import org.onosproject.ui.UiMessageHandlerFactory;
 import org.onosproject.ui.UiMessageHandlerFactory;
 import org.onosproject.ui.UiTopoOverlayFactory;
 import org.onosproject.ui.UiTopoOverlayFactory;
-import org.onosproject.ui.impl.topo.UiTopoSession;
-import org.onosproject.ui.impl.topo.model.UiSharedTopologyModel;
 import org.onosproject.ui.topo.TopoConstants;
 import org.onosproject.ui.topo.TopoConstants;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
@@ -65,7 +63,7 @@ public class UiWebSocket
 
 
     private final ObjectMapper mapper = new ObjectMapper();
     private final ObjectMapper mapper = new ObjectMapper();
     private final ServiceDirectory directory;
     private final ServiceDirectory directory;
-    private final UiTopoSession topoSession;
+//    private final UiTopoSession topoSession;
 
 
     private Connection connection;
     private Connection connection;
     private FrameConnection control;
     private FrameConnection control;
@@ -85,8 +83,8 @@ public class UiWebSocket
     public UiWebSocket(ServiceDirectory directory, String userName) {
     public UiWebSocket(ServiceDirectory directory, String userName) {
         this.directory = directory;
         this.directory = directory;
         this.userName = userName;
         this.userName = userName;
-        this.topoSession =
-                new UiTopoSession(this, directory.get(UiSharedTopologyModel.class));
+//        this.topoSession =
+//                new UiTopoSession(this, directory.get(UiSharedTopologyModel.class));
     }
     }
 
 
     @Override
     @Override
@@ -130,7 +128,7 @@ public class UiWebSocket
         this.connection = connection;
         this.connection = connection;
         this.control = (FrameConnection) connection;
         this.control = (FrameConnection) connection;
         try {
         try {
-            topoSession.init();
+//            topoSession.init();
             createHandlersAndOverlays();
             createHandlersAndOverlays();
             sendBootstrapData();
             sendBootstrapData();
             log.info("GUI client connected -- user <{}>", userName);
             log.info("GUI client connected -- user <{}>", userName);
@@ -145,7 +143,7 @@ public class UiWebSocket
 
 
     @Override
     @Override
     public synchronized void onClose(int closeCode, String message) {
     public synchronized void onClose(int closeCode, String message) {
-        topoSession.destroy();
+//        topoSession.destroy();
         destroyHandlersAndOverlays();
         destroyHandlersAndOverlays();
         log.info("GUI client disconnected [close-code={}, message={}]",
         log.info("GUI client disconnected [close-code={}, message={}]",
                 closeCode, message);
                 closeCode, message);

@@ -66,7 +66,7 @@ import org.slf4j.LoggerFactory;
 /**
 /**
  * Service that creates and maintains the UI-model of the network topology.
  * Service that creates and maintains the UI-model of the network topology.
  */
  */
-@Component(immediate = true)
+@Component(immediate = true, enabled = false)
 @Service(value = UiSharedTopologyModel.class)
 @Service(value = UiSharedTopologyModel.class)
 public final class UiSharedTopologyModel
 public final class UiSharedTopologyModel
         extends AbstractListenerManager<UiModelEvent, UiModelListener> {
         extends AbstractListenerManager<UiModelEvent, UiModelListener> {