[Acmcontester-developers] SF.net SVN: acmcontester:[399] ACMServer/trunk/ACMServer/Plugins/ MediatorPlugins

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

Revision: 399
          http://acmcontester.svn.sourceforge.net/acmcontester/?rev=399&view=rev
Author:   brus07
Date:     2008-09-30 18:19:23 +0000 (Tue, 30 Sep 2008)

Log Message:
-----------
Added different logmessage type for view in LogDataGridView in WebGatePlugin and SocketServerGatePlugin.

Modified Paths:
--------------
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs
    ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs	2008-09-30 12:59:52 UTC (rev 398)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGate.cs	2008-09-30 18:19:23 UTC (rev 399)
@@ -37,7 +37,7 @@
             Submit submit = Submit.CreateFromXml(message.Message);
             if (dataContainer.Add(submit) == true)
             {
-                OnLogMessage("send " + submit.id + " to " + clientIndex);
+                OnLogMessage("Send", submit.id + " to " + clientIndex);
                 base.DataSender(message, clientIndex);
             }
         }
@@ -45,13 +45,14 @@
 
         private void GenerateLogMessageWirhIDs(SubmitList submitList)
         {
-            OnLogMessage("Get submits");
+            string message = "Get submits" + Environment.NewLine;
             string ids = "";
             for (int i = 0; i < submitList.Items.Length; i++)
             {
                 ids += " " + submitList.Items[i].id.ToString();
             }
-            OnLogMessage("\t ID: " + ids);
+            message += " ID: " + ids;
+            OnLogMessage("Receive", message);
         }
 
         public new bool Send(SystemMessage message)
@@ -78,8 +79,9 @@
         {
             Result result = Result.CreateFromXml(message.Message);
 
-            OnLogMessage("result " + result.Submit.id);
-            OnLogMessage("\t " + result.res);
+            string mes = "result " + result.Submit.id;
+            mes += " " + result.res;
+            OnLogMessage("Receive", mes);
 
             base.DataArriver(message);
             dataContainer.Return(result);
@@ -93,18 +95,20 @@
 
         public class LogMessageEventArgs : EventArgs
         {
+            public string type;
             public string message;
-            public LogMessageEventArgs(string mes)
+            public LogMessageEventArgs(string type, string message)
             {
-                message = mes;
+                this.type = type;
+                this.message = message;
             }
         }
         public event EventHandler<LogMessageEventArgs> LogMessage;
-        private void OnLogMessage(string p)
+        private void OnLogMessage(string type, string p)
         {
             EventHandler<LogMessageEventArgs> temp = LogMessage;
             if (temp != null)
-                temp(this, new LogMessageEventArgs(p));
+                temp(this, new LogMessageEventArgs(type, p));
         }
     }
 }

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs	2008-09-30 12:59:52 UTC (rev 398)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePlugin.cs	2008-09-30 18:19:23 UTC (rev 399)
@@ -29,16 +29,14 @@
             socketServerGate.Send(message);
         }
 
-        private void AddTextToContorl(string message)
+        private void AddTextToContorl(string type, string message)
         {
-            string result = DateTime.Now.ToLongTimeString() + "." + DateTime.Now.Millisecond.ToString();
-            result += " " + message + Environment.NewLine;
-            ((SocketServerGatePluginUserControl)base.Control).AddText(result);
+            ((SocketServerGatePluginUserControl)base.Control).AddText(type, message);
         }
 
         void socketServerGate_LogMessage(object sender, SocketServerGate.LogMessageEventArgs e)
         {
-            AddTextToContorl(e.message);
+            AddTextToContorl(e.type, e.message);
         }
     }
 }

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs	2008-09-30 12:59:52 UTC (rev 398)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/SocketServerGatePlugin/SocketServerGatePluginUserControl.cs	2008-09-30 18:19:23 UTC (rev 399)
@@ -35,7 +35,8 @@
             }
             else
             {
-                textBox1.Text += text;
+                string timeStr = DateTime.Now.ToLongTimeString() + "." + DateTime.Now.Millisecond.ToString();
+                textBox1.Text += timeStr + " " + text + Environment.NewLine;
                 if (autoScrollCheckBox.Checked)
                 {
                     textBox1.Select(textBox1.Text.Length, 0);
@@ -43,10 +44,10 @@
                 }
             }
         }
-        public void AddText(string text)
+        public void AddText(string type, string text)
         {
-            AddTextToTextLog(text);
-            view.AddRow(new LogDataGridView.SystemMessage(text, LogDataGridView.SystemMessageMode.Other));
+            AddTextToTextLog(type + ": " + text);
+            view.AddRow(new LogDataGridView.SystemMessage(text, type));
         }
 
         delegate void UpdateClientsCountStatusCallback(int clientsCount);

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs	2008-09-30 12:59:52 UTC (rev 398)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePlugin.cs	2008-09-30 18:19:23 UTC (rev 399)
@@ -26,16 +26,16 @@
             {
                 return;
             }
-            string text = "    Send: " + message.Message.Length + " bytes" + Environment.NewLine;
-            ((WebGatePluginUserControl)base.Control).AddText(text);
+            string text = message.Message.Length + " bytes" + Environment.NewLine;
+            ((WebGatePluginUserControl)base.Control).AddText("Send", text);
 
             webGate.Send(message);
         }
 
         protected override void DataArrived(SystemMessage message)
         {
-            string text = "Arrived: " + message.Message.Length + " bytes";
-            ((WebGatePluginUserControl)base.Control).AddText(text);
+            string text = message.Message.Length + " bytes";
+            ((WebGatePluginUserControl)base.Control).AddText("Receive", text);
 
             if (message.IsType("Empty") == false)
                 base.DataArrived(message);

Modified: ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs
===================================================================
--- ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs	2008-09-30 12:59:52 UTC (rev 398)
+++ ACMServer/trunk/ACMServer/Plugins/MediatorPlugins/WebGatePlugin/WebGatePluginUserControl.cs	2008-09-30 18:19:23 UTC (rev 399)
@@ -65,10 +65,10 @@
             }
         }
 
-        public void AddText(string text)
+        public void AddText(string type, string text)
         {
-            AddTextToTextLog(text);
-            view.AddRow(new LogDataGridView.SystemMessage(text, LogDataGridView.SystemMessageMode.Other));
+            AddTextToTextLog(type + ": " + text);
+            view.AddRow(new LogDataGridView.SystemMessage(text, type));
         }
 
         public string MainStatusMessage


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