Changeset 6925 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive.JobManager

Timestamp:

10/13/11 20:45:08 (13 years ago)

Author:

ascheibe

Message:

#1233 fixed bug in PermissionView "bugfix"

Location:

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

Files:

• HiveJobPermissionListView.cs (modified) (2 diffs)
• HiveJobPermissionView.Designer.cs (modified) (2 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;
@@ -45 +44 @@
       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.Validating += new System.ComponentModel.CancelEventHandler(this.usernameTextBox_Validating);
+      this.usernameTextBox.TextChanged += new System.EventHandler(this.usernameTextBox_TextChanged);
       // 
       // permissionComboBox
@@ -72 +72 @@
       this.permissionComboBox.Size = new System.Drawing.Size(281, 21);
       this.permissionComboBox.TabIndex = 4;
-      this.permissionComboBox.Validating += new System.ComponentModel.CancelEventHandler(this.permissionComboBox_Validating);
+      this.permissionComboBox.SelectedValueChanged += new System.EventHandler(this.permissionComboBox_SelectedValueChanged);
       // 
       // HiveJobPermissionView

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

@@ -20 +20 @@
 #endregion
 
-using System.ComponentModel;
 using HeuristicLab.Clients.Hive.Views;
 using HeuristicLab.MainForm;
@@ -62 +61 @@
     }
 
-    #region Child Control Events
-
-    private void usernameTextBox_Validating(object sender, CancelEventArgs e) {
-      Content.GrantedUserName = usernameTextBox.Text;
+    private void usernameTextBox_TextChanged(object sender, System.EventArgs e) {
+      if (Content != null) {
+        Content.GrantedUserName = usernameTextBox.Text;
+      }
     }
 
-    private void permissionComboBox_Validating(object sender, CancelEventArgs e) {
-      Content.Permission = (Permission)permissionComboBox.SelectedItem;
+    private void permissionComboBox_SelectedValueChanged(object sender, System.EventArgs e) {
+      if (Content != null) {
+        Content.Permission = (Permission)permissionComboBox.SelectedItem;
+      }
     }
-    #endregion
   }
 }