more organization. Renamed private members. No breaking changes.

Author: StephenHodgson

Assets/HoloToolkit/Sharing/Scripts/SharingStage.cs

@@ -164,6 +164,8 @@ public bool IsConnected
             get { return Manager != null && Connection != null && Connection.IsConnected(); }
         }
 
+        #region Unity Methods
+
         protected override void Awake()
         {
             base.Awake();
@@ -177,13 +179,13 @@ protected override void Awake()
             }
             else
             {
-                Connect();
+                ManagerInit();
             }
         }
 
         private void OnEnable()
         {
-            Application.logMessageReceived += HandleLog;
+            Application.logMessageReceived += OnLogReceived;
         }
 
         private void LateUpdate()
@@ -202,7 +204,7 @@ private void LateUpdate()
 
         private void OnDisable()
         {
-            Application.logMessageReceived -= HandleLog;
+            Application.logMessageReceived -= OnLogReceived;
         }
 
         protected override void OnDestroy()
@@ -259,7 +261,77 @@ protected override void OnDestroy()
             base.OnDestroy();
         }
 
-        private void Connect()
+        #endregion // Unity Methods
+
+        #region Callbacks
+
+        private void OnNetworkConnectionChanged(NetworkConnection networkConnection)
+        {
+            if (IsConnected)
+            {
+                if (SharingManagerConnected != null)
+                {
+                    SharingManagerConnected(this, EventArgs.Empty);
+                }
+            }
+            else
+            {
+                if (SharingManagerDisconnected != null)
+                {
+                    SharingManagerDisconnected(this, EventArgs.Empty);
+                }
+            }
+        }
+
+        private void OnSystemDiscovered(DiscoveredSystem system)
+        {
+            if (system.GetRole() != SystemRole.SessionDiscoveryServerRole) { return; }
+
+            // Found a server. Stop pinging the network and connect.
+            isTryingToFindServer = false;
+            ServerAddress = system.GetAddress();
+
+            if (ShowDetailedLogs)
+            {
+                Debug.Log("Server discovered at: " + ServerAddress);
+            }
+
+            ManagerInit();
+
+            if (ShowDetailedLogs)
+            {
+                Debug.LogFormat("Connected to: {0}:{1}", ServerAddress, ServerPort.ToString());
+            }
+        }
+
+        private void OnLogReceived(string logString, string stackTrace, LogType type)
+        {
+            switch (type)
+            {
+                case LogType.Error:
+                case LogType.Assert:
+                case LogType.Exception:
+                    Log.Error(string.Format("{0} \n {1}", logString, stackTrace));
+                    break;
+
+                case LogType.Warning:
+                    Log.Warning(string.Format("{0} \n {1}", logString, stackTrace));
+                    break;
+
+                case LogType.Log:
+                    if (ShowDetailedLogs)
+                    {
+                        Log.Info(logString);
+                    }
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException("type", type, "Invalid Message Type");
+            }
+        }
+
+        #endregion // Callbacks
+
+        private void ManagerInit()
         {
             var config = new ClientConfig(ClientRole);
             config.SetIsAudioEndpoint(IsAudioEndpoint);
@@ -276,8 +348,8 @@ private void Connect()
 
             // Set up callbacks so that we know when we've connected successfully.
             networkConnectionAdapter = new NetworkConnectionAdapter();
-            networkConnectionAdapter.ConnectedCallback += NetworkConnectionAdapter_ConnectedCallback;
-            networkConnectionAdapter.DisconnectedCallback += NetworkConnectionAdapter_ConnectedCallback;
+            networkConnectionAdapter.ConnectedCallback += OnNetworkConnectionChanged;
+            networkConnectionAdapter.DisconnectedCallback += OnNetworkConnectionChanged;
             Connection.AddListener((byte)MessageID.StatusOnly, networkConnectionAdapter);
 
             SyncStateListener = new SyncStateListener();
@@ -306,29 +378,6 @@ private void Connect()
             }
         }
 
-        private void NetworkConnectionAdapter_ConnectedCallback(NetworkConnection obj)
-        {
-            SendConnectedNotification();
-        }
-
-        private void SendConnectedNotification()
-        {
-            if (IsConnected)
-            {
-                if (SharingManagerConnected != null)
-                {
-                    SharingManagerConnected(this, EventArgs.Empty);
-                }
-            }
-            else
-            {
-                if (SharingManagerDisconnected != null)
-                {
-                    SharingManagerDisconnected(this, EventArgs.Empty);
-                }
-            }
-        }
-
         private void AutoDiscoverInit()
         {
             if (ShowDetailedLogs)
@@ -363,27 +412,6 @@ private void AutoDiscoverUpdate()
             discoveryClient.Update();
         }
 
-        private void OnSystemDiscovered(DiscoveredSystem obj)
-        {
-            if (obj.GetRole() != SystemRole.SessionDiscoveryServerRole) { return; }
-
-            // Found a server. Stop pinging the network and connect.
-            isTryingToFindServer = false;
-            ServerAddress = obj.GetAddress();
-
-            if (ShowDetailedLogs)
-            {
-                Debug.Log("Server discovered at: " + ServerAddress);
-            }
-
-            Connect();
-
-            if (ShowDetailedLogs)
-            {
-                Debug.LogFormat("Connected to: {0}:{1}", ServerAddress, ServerPort.ToString());
-            }
-        }
-
         public void ConnectToServer(string serverAddress, int port)
         {
             ServerAddress = serverAddress;
@@ -395,30 +423,5 @@ public void ConnectToServer()
         {
             Manager.SetServerConnectionInfo(ServerAddress, (uint)ServerPort);
         }
-
-        private void HandleLog(string logString, string stackTrace, LogType type)
-        {
-            switch (type)
-            {
-                case LogType.Error:
-                case LogType.Assert:
-                case LogType.Exception:
-                    Log.Error(string.Format("{0} \n {1}", logString, stackTrace));
-                    break;
-
-                case LogType.Warning:
-                    Log.Warning(string.Format("{0} \n {1}", logString, stackTrace));
-                    break;
-
-                case LogType.Log:
-                    if (ShowDetailedLogs)
-                    {
-                        Log.Info(logString);
-                    }
-                    break;
-                default:
-                    throw new ArgumentOutOfRangeException("type", type, "Invalid Message Type");
-            }
-        }
     }
 }