Changeset 7152

Timestamp:

12/07/11 21:00:11 (10 years ago)

Author:

ascheibe

Message:

#1672

• added missing invokes
• removed collecting types of object graph for retrieval of plugins as this isn't needed for MetaOpt. I think the problem was that MetaOpt always stored types of all available algorithms and problems which caused the problem (#1527) with Hive.

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Clients.Hive.Administrator/3.3/Views/ScheduleView.cs

@@ -192 +192 @@
           DeleteAppointment();
         else {
-          DialogResult res = MessageBox.Show("Delete all events in this series?", "Delete recurrences", MessageBoxButtons.YesNo);
+          DialogResult res = MessageBox.Show("Delete all events in this series?", "Delete recurrences", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
           if (res != DialogResult.Yes)
             DeleteAppointment();
@@ -282 +282 @@
           //change recurring appointment
           //check, if only selected appointment has to change or whole recurrence
-          DialogResult res = MessageBox.Show("Change all events in this series?", "Change recurrences", MessageBoxButtons.YesNo);
+          DialogResult res = MessageBox.Show("Change all events in this series?", "Change recurrences", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
           if (res != DialogResult.Yes) {
             if (CreateAppointment())

trunk/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobListView.cs

@@ -61 +61 @@
 
     protected override void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<RefreshableJob> e) {
-      base.Content_ItemsAdded(sender, e);
-      foreach (ColumnHeader c in this.itemsListView.Columns) {
-        c.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
-      }
-      foreach (var item in e.Items) {
-        item.ItemImageChanged += new EventHandler(item_ItemImageChanged);
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<RefreshableJob>(Content_ItemsAdded), sender, e);
+      } else {
+        base.Content_ItemsAdded(sender, e);
+        foreach (ColumnHeader c in this.itemsListView.Columns) {
+          c.AutoResize(ColumnHeaderAutoResizeStyle.ColumnContent);
+        }
+        foreach (var item in e.Items) {
+          item.ItemImageChanged += new EventHandler(item_ItemImageChanged);
+        }
       }
     }
 
     void item_ItemImageChanged(object sender, EventArgs e) {
-        if (this.itemsListView.InvokeRequired) {
-            Invoke(new EventHandler(item_ItemImageChanged), sender, e); 
-        } else { 
-          RefreshableJob job = sender as RefreshableJob;
-          if (job != null) {
-            foreach (ListViewItem item in this.itemsListView.Items) {
-                if (item.Tag != null)
-                {
-                    RefreshableJob cur = item.Tag as RefreshableJob;
-                    if (cur != null && cur == job)
-                    {
-                        this.UpdateListViewItemImage(item);
-                    }
-                }
+      if (this.itemsListView.InvokeRequired) {
+        Invoke(new EventHandler(item_ItemImageChanged), sender, e);
+      } else {
+        RefreshableJob job = sender as RefreshableJob;
+        if (job != null) {
+          foreach (ListViewItem item in this.itemsListView.Items) {
+            if (item.Tag != null) {
+              RefreshableJob cur = item.Tag as RefreshableJob;
+              if (cur != null && cur == job) {
+                this.UpdateListViewItemImage(item);
+              }
             }
-         }
+          }
+        }
       }
     }
 
     protected override void Content_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<RefreshableJob> e) {
-      base.Content_ItemsRemoved(sender, e);
-      foreach (var item in e.Items) {
-        item.ItemImageChanged -= new EventHandler(item_ItemImageChanged);
-      }
-      if (Content != null && Content.Count == 0) {
-        foreach (ColumnHeader c in this.itemsListView.Columns) {
-          c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+      if (InvokeRequired) {
+        Invoke(new CollectionItemsChangedEventHandler<RefreshableJob>(Content_ItemsRemoved), sender, e);
+      } else {
+        base.Content_ItemsRemoved(sender, e);
+        foreach (var item in e.Items) {
+          item.ItemImageChanged -= new EventHandler(item_ItemImageChanged);
+        }
+        if (Content != null && Content.Count == 0) {
+          foreach (ColumnHeader c in this.itemsListView.Columns) {
+            c.AutoResize(ColumnHeaderAutoResizeStyle.HeaderSize);
+          }
         }
       }

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveJobs/EngineHiveTask.cs

@@ -22 +22 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -61 +60 @@
       jobData.Data = PersistenceUtil.Serialize(ItemTask, out usedTypes);
 
-      // add type objects from object graph to work around ticket #1527
-      var typeObjects = ItemTask.GetObjectGraphObjects().OfType<Type>();
-      usedTypes = new List<Type>(usedTypes).Union(typeObjects);
-
       PluginUtil.CollectDeclaringPlugins(plugins, usedTypes);
-
       return jobData;
     }