Changeset 6924

Timestamp:

10/13/11 19:39:50 (13 years ago)

Author:

ascheibe

Message:

#1233 fixed bug in PermissionView in JobManager

Location:

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views

Files:

• HiveJobPermissionListView.cs (modified) (2 diffs)
• HiveJobPermissionView.Designer.cs (modified) (3 diffs)
• HiveJobPermissionView.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionListView.cs

@@ -21 +21 @@
 
 using System;
+using System.ComponentModel;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
@@ -44 +45 @@
       return new JobPermission() { JobId = this.hiveExperimentId };
     }
+
+    protected override void RegisterContentEvents() {
+      base.RegisterContentEvents();
+
+      if (Content != null) {
+        foreach (JobPermission permission in Content) {
+          permission.PropertyChanged += new PropertyChangedEventHandler(permission_PropertyChanged);
+        }
+      }
+    }
+
+    protected override void DeregisterContentEvents() {
+      base.DeregisterContentEvents();
+
+      if (Content != null) {
+        foreach (JobPermission permission in Content) {
+          permission.PropertyChanged -= new PropertyChangedEventHandler(permission_PropertyChanged);
+        }
+      }
+    }
+
+    protected override void Content_ItemsAdded(object sender, Collections.CollectionItemsChangedEventArgs<JobPermission> e) {
+      base.Content_ItemsAdded(sender, e);
+
+      foreach (JobPermission permission in e.Items) {
+        permission.PropertyChanged += new PropertyChangedEventHandler(permission_PropertyChanged);
+      }
+    }
+
+    protected override void Content_ItemsRemoved(object sender, Collections.CollectionItemsChangedEventArgs<JobPermission> e) {
+      foreach (JobPermission permission in e.Items) {
+        permission.PropertyChanged -= new PropertyChangedEventHandler(permission_PropertyChanged);
+      }
+    }
+
+    protected override void Content_CollectionReset(object sender, Collections.CollectionItemsChangedEventArgs<JobPermission> e) {
+      Content_ItemsRemoved(sender, e);
+    }
+
+    void permission_PropertyChanged(object sender, PropertyChangedEventArgs e) {
+      OnContentChanged();
+    }
   }
 }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.Designer.cs

@@ -60 +60 @@
       this.usernameTextBox.Size = new System.Drawing.Size(281, 20);
       this.usernameTextBox.TabIndex = 3;
-      this.usernameTextBox.Validated += new System.EventHandler(this.usernameTextBox_Validated);
+      this.usernameTextBox.Validating += new System.ComponentModel.CancelEventHandler(this.usernameTextBox_Validating);
       // 
       // permissionComboBox
@@ -72 +72 @@
       this.permissionComboBox.Size = new System.Drawing.Size(281, 21);
       this.permissionComboBox.TabIndex = 4;
-      this.permissionComboBox.Validated += new System.EventHandler(this.permissionComboBox_Validated);
+      this.permissionComboBox.Validating += new System.ComponentModel.CancelEventHandler(this.permissionComboBox_Validating);
       // 
-      // HiveExperimentPermissionView
+      // HiveJobPermissionView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -82 +82 @@
       this.Controls.Add(this.permissionLabel);
       this.Controls.Add(this.usernameTextBox);
-      this.Name = "HiveExperimentPermissionView";
+      this.Name = "HiveJobPermissionView";
       this.Controls.SetChildIndex(this.usernameTextBox, 0);
       this.Controls.SetChildIndex(this.permissionLabel, 0);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobPermissionView.cs

@@ -47 +47 @@
       } else {
         usernameTextBox.Text = Content.GrantedUserName;
-        permissionComboBox.SelectedValue = Content.Permission;
+        permissionComboBox.SelectedItem = Content.Permission;
       }
     }
@@ -67 +67 @@
       Content.GrantedUserName = usernameTextBox.Text;
     }
-    private void usernameTextBox_Validated(object sender, System.EventArgs e) {
-
-    }
 
     private void permissionComboBox_Validating(object sender, CancelEventArgs e) {
       Content.Permission = (Permission)permissionComboBox.SelectedItem;
     }
-    private void permissionComboBox_Validated(object sender, System.EventArgs e) {
-
-    }
     #endregion
   }