[Acmcontester-developers] SF.net SVN: acmcontester:[300] ACMServer/trunk/ACMServer

[<br...@us...>]

Revision: 300
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=300&view=rev
Author:   brus07
Date:     2008-07-23 12:24:09 +0000 (Wed, 23 Jul 2008)

Log Message:
-----------
Optimize plugin interface. Remove "onWorkingData" event.

Modified Paths:
--------------
    ACMServer/trunk/ACMServer/Mediator/Form1.cs
    ACMServer/trunk/ACMServer/Mediator/Library/MediatorKernel.cs
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs
    ACMServer/trunk/ACMServer/Plugins/PluginsFramework/BaseMediatorPlugin.cs

Modified: ACMServer/trunk/ACMServer/Mediator/Form1.cs
===================================================================
--- ACMServer/trunk/ACMServer/Mediator/Form1.cs	2008-07-22 20:24:30 UTC (rev 299)
+++ ACMServer/trunk/ACMServer/Mediator/Form1.cs	2008-07-23 12:24:09 UTC (rev 300)
@@ -26,7 +26,6 @@
         private void button2_Click(object sender, EventArgs e)
         {
             kernel = new AcmContester.Mediator.Library.MediatorKernel();
-            kernel.onWorkingData += WorkingData;
             System.Threading.ThreadPool.QueueUserWorkItem(RunLoadDll);
         }
 
@@ -55,26 +54,19 @@
             }
         }
 
-        private void WorkingData(string message)
+        delegate void UpdateTextLogCallback(string message, TextBox textBox);
+        private void UpdateTextLog(string message, TextBox textBox)
         {
-            string s = DateTime.Now.ToShortDateString() + " " + DateTime.Now.ToLongTimeString() + ": ";
-            s += message;
-            UpdateTextLog(s + "\r\n");
-        }
-
-        delegate void UpdateTextLogCallback(string message);
-        private void UpdateTextLog(string message)
-        {
-            if (this.textBox3.InvokeRequired)
+            if (textBox.InvokeRequired)
             {
                 UpdateTextLogCallback d = new UpdateTextLogCallback(UpdateTextLog);
                 this.Invoke(d, new object[] { message });
             }
             else
             {
-                textBox3.Text += message;
-                textBox3.Select(textBox3.Text.Length, 0);
-                textBox3.ScrollToCaret();
+                textBox.Text += message;
+                textBox.Select(textBox3.Text.Length, 0);
+                textBox.ScrollToCaret();
             }
 
         }

Modified: ACMServer/trunk/ACMServer/Mediator/Library/MediatorKernel.cs
===================================================================
--- ACMServer/trunk/ACMServer/Mediator/Library/MediatorKernel.cs	2008-07-22 20:24:30 UTC (rev 299)
+++ ACMServer/trunk/ACMServer/Mediator/Library/MediatorKernel.cs	2008-07-23 12:24:09 UTC (rev 300)
@@ -45,7 +45,6 @@
             foreach (BaseMediatorPlugin plugin in testerSideList)
             {
                 plugin.onDataArrived += DataArrivedFromTesterList;
-                plugin.onWorkingData += WorkingData;
                 if (plugin.Control != null)
                 {
                     this.OnAddControl(new ControlEventArgs(plugin.Control, plugin.GetType().Name));
@@ -55,7 +54,6 @@
             foreach (BaseMediatorPlugin plugin in clientSideList)
             {
                 plugin.onDataArrived += DataArrivedFromClientList;
-                plugin.onWorkingData += WorkingData;
                 if (plugin.Control != null)
                 {
                     this.OnAddControl(new ControlEventArgs(plugin.Control, plugin.GetType().Name));
@@ -70,14 +68,6 @@
                 temp(this, e);
         }
 
-        public delegate void WorkingData_EventHandler(string message);
-        public event WorkingData_EventHandler onWorkingData;
-        private void WorkingData(string message)
-        {
-            if (onWorkingData != null)
-                onWorkingData(message);
-        }
-
         private void DataArrivedFromClientList(string message)
         {
             if (testerSideList != null)

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs	2008-07-22 20:24:30 UTC (rev 299)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs	2008-07-23 12:24:09 UTC (rev 300)
@@ -25,8 +25,6 @@
                 socketServerGate.Stop();
                 return;
             }
-            WorkingData("SocketServerGatePlugin::Send(" + message + ")");
-            WorkingData("SocketServerGatePlugin::Send CountClients = " + socketServerGate.CountClients().ToString());
             socketServerGate.Send(message);
         }
 

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs	2008-07-22 20:24:30 UTC (rev 299)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs	2008-07-23 12:24:09 UTC (rev 300)
@@ -18,7 +18,6 @@
 
         public override void Send(string message)
         {
-            WorkingData("WebGatePlugin::Send(" + message + ")");
             webGate.Send(message);
         }
     }

Modified: ACMServer/trunk/ACMServer/Plugins/PluginsFramework/BaseMediatorPlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/PluginsFramework/BaseMediatorPlugin.cs	2008-07-22 20:24:30 UTC (rev 299)
+++ ACMServer/trunk/ACMServer/Plugins/PluginsFramework/BaseMediatorPlugin.cs	2008-07-23 12:24:09 UTC (rev 300)
@@ -8,9 +8,6 @@
         public delegate void DataArrived_EventHandler(string message);
         public event DataArrived_EventHandler onDataArrived;
 
-        public delegate void WorkingData_EventHandler(string message);
-        public event WorkingData_EventHandler onWorkingData;
-
         public abstract void Send(string message);
 
         private UserControl control = null;
@@ -29,15 +26,8 @@
 
         protected virtual void DataArrived(string message)
         {
-            WorkingData("BaseMediatorPlugin::DataArrived(" + message + ")");
             if (onDataArrived != null)
                 onDataArrived(message);
         }
-
-        protected virtual void WorkingData(string message)
-        {
-            if (onWorkingData != null)
-                onWorkingData(message);
-        }
     }
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.