Changeset 7927

Timestamp:

05/29/12 17:20:31 (12 years ago)

Author:

jkarder

Message:

#1711:

• removed HiveResourceSelector property in HiveResourceSelectorDialog
• added View and Content attributes to HiveResourceSelector
• added check if Content is null in OnContentChanged in HiveResourceSelector

Location:

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

Files:

• HiveResourceSelector.cs (modified) (2 diffs)
• HiveResourceSelectorDialog.cs (modified) (1 diff)

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

@@ -33 +33 @@
 
 namespace HeuristicLab.Clients.Hive.JobManager.Views {
+  [View("Hive Resource Selector View")]
+  [Content(typeof(IItemList<Resource>), true)]
   public partial class HiveResourceSelector : ItemView, IDisposable {
     private const int slaveImageIndex = 0;
@@ -93 +95 @@
 
     protected override void OnContentChanged() {
-      base.OnContentChanged();
-      selectedResources = new HashSet<Resource>(Content.Where(x => selectedResources.Any(y => x.Id == y.Id)));
+      if (Content != null) {
+        base.OnContentChanged();
+        selectedResources = new HashSet<Resource>(Content.Where(x => selectedResources.Any(y => x.Id == y.Id)));
+      }
       UpdateMainTree();
       ExtractStatistics();

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

@@ -27 +27 @@
 namespace HeuristicLab.Clients.Hive.JobManager.Views {
   public partial class HiveResourceSelectorDialog : Form {
-    public HiveResourceSelector HiveResourceSelector {
-      get { return hiveResourceSelector; }
-    }
-
     public HiveResourceSelectorDialog() {
       InitializeComponent();