Changeset 5320 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4

Timestamp:

01/18/11 13:06:41 (13 years ago)

Author:

ascheibe

Message:

#1233 don't log every message 2 times

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4

Files:

• SlaveItem.cs (modified) (3 diffs)
• SlaveView.Designer.cs (modified) (1 diff)
• SlaveView.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveItem.cs

@@ -130 +130 @@
 
     public event EventHandler<EventArgs<StatusCommons>> SlaveStatusChanged;
-    public void OnStatusChanged(StatusCommons status) {
-      System.Console.WriteLine("SlaveCommListener: " + status);
+    public void OnStatusChanged(StatusCommons status) {      
       var handler = SlaveStatusChanged;
       if (handler != null) handler(this, new EventArgs<StatusCommons>(status));
@@ -137 +136 @@
 
     public event EventHandler<EventArgs<string>> SlaveMessageLogged;
-    public void OnMessageLogged(string message) {
-      System.Console.WriteLine("SlaveCommListener: " + message);
+    public void OnMessageLogged(string message) {      
       var handler = SlaveMessageLogged;
       if (handler != null) handler(this, new EventArgs<string>(message));
@@ -144 +142 @@
 
     public event EventHandler SlaveShutdown;
-    public void OnShutdown() {
-      System.Console.WriteLine("SlaveCommListner: Slave quit");
+    public void OnShutdown() {      
       var handler = SlaveShutdown;
       if (handler != null) handler(this, EventArgs.Empty);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.Designer.cs

@@ -63 +63 @@
       // txtLog
       // 
+      this.txtLog.BackColor = System.Drawing.Color.White;
       this.txtLog.Location = new System.Drawing.Point(20, 172);
       this.txtLog.Multiline = true;

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.Slave.Views/3.4/SlaveView.cs

@@ -34 +34 @@
     public new SlaveItem Content {
       get { return (SlaveItem)base.Content; }
-      set { base.Content = value; }
+      set {
+        if (base.Content != value) {
+          base.Content = value;
+        }
+      }
     }
 
@@ -43 +47 @@
     #region Register Content Events
     protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-
       Content.SlaveMessageLogged -= new System.EventHandler<EventArgs<string>>(Content_SlaveMessageLogged);
       Content.SlaveShutdown -= new System.EventHandler(Content_SlaveShutdown);
       Content.SlaveStatusChanged -= new System.EventHandler<EventArgs<StatusCommons>>(Content_SlaveStatusChanged);
+
+      base.DeregisterContentEvents();
     }
 
@@ -62 +66 @@
       base.OnContentChanged();
       if (Content == null) {
-        // TODO: Put code here when content is null
+        //nothing to do...        
       } else {
         //try to establish a connection to the slave service 
         if (base.Content != null && ((SlaveItem)base.Content).isClosed()) {
-          RegisterContentEvents();
           ((SlaveItem)base.Content).Open();
         }