Changeset 739 for trunk

Timestamp:

11/12/08 15:06:16 (16 years ago)

Author:

kgrading

Message:

moved the MessageQueue enumerator to MessageContainer (#353)

Location:

trunk/sources

Files:

• HeuristicLab.Hive.Client.Common/Logging.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Common/MessageContainer.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Common/MessageQueue.cs (modified) (2 diffs)
• HeuristicLab.Hive.Client.Core/Core.cs (modified) (1 diff)
• HeuristicLab.Hive.Client.Core/Heartbeat.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Hive.Client.Common/Logging.cs

@@ -46 +46 @@
     }
 
-    private Logging() {
-      eventLogger = new EventLog("Hive Client");    
+    private Logging() {      
+      eventLogger = new EventLog("Hive Client");          
     }
 

trunk/sources/HeuristicLab.Hive.Client.Common/MessageContainer.cs

@@ -31 +31 @@
   /// </summary>
   public class MessageContainer {
-    public MessageQueue.MessageType Message { get; set; }
+
+    public enum MessageType { FetchJob, AbortJob, RequestSnapshot, FinishedJob };
+
+    public MessageType Message { get; set; }
     public int JobId { get; set; }
 
-    public MessageContainer(MessageQueue.MessageType message) {
+    public MessageContainer(MessageType message) {
       Message = message;
       JobId = 0;
     }
-    public MessageContainer(MessageQueue.MessageType message, int jobId) {
+    public MessageContainer(MessageType message, int jobId) {
       Message = message;
       JobId = jobId;

trunk/sources/HeuristicLab.Hive.Client.Common/MessageQueue.cs

@@ -33 +33 @@
 
     private static MessageQueue instance = null;
-
-    public enum MessageType { FetchJob, AbortJob, RequestSnapshot, FinishedJob };
+    
     private Queue<MessageContainer> queue = null;
     private Semaphore semaphore = null;
@@ -88 +87 @@
     /// </summary>
     /// <param name="message">the Message</param>
-    public void AddMessage(MessageType message) {
+    public void AddMessage(MessageContainer.MessageType message) {
       lock (this) {
         queue.Enqueue(new MessageContainer(message));

trunk/sources/HeuristicLab.Hive.Client.Core/Core.cs

@@ -29 +29 @@
   public class Core {
     public void Start() {
-      //Logging.getInstance().Info(this.Name, "Info Message");
-      //Logging.getInstance().Error(this.Name, "Error Message");
-      //Logging.getInstance().Error(this.Name, "Exception Message", new Exception("Exception"));
+      Logging.getInstance().Info(this.ToString(), "Info Message");
+      Logging.getInstance().Error(this.ToString(), "Error Message");
+      Logging.getInstance().Error(this.ToString(), "Exception Message", new Exception("Exception"));      
 
       Heartbeat beat = new Heartbeat();

trunk/sources/HeuristicLab.Hive.Client.Core/Heartbeat.cs

@@ -61 +61 @@
     void heartbeatTimer_Elapsed(object sender, ElapsedEventArgs e) {
       Console.WriteLine("tick");
-      MessageQueue.GetInstance().AddMessage(MessageQueue.MessageType.FetchJob);
+      MessageQueue.GetInstance().AddMessage(MessageContainer.MessageType.FetchJob);
     }