Changeset 9444 for branches/HivePerformance/sources/HeuristicLab.Clients.Hive.JobManager

Timestamp:

05/06/13 12:30:18 (12 years ago)

Author:

pfleck

Message:

#2030
Switched Text encoding to Mtom encoding for better performance for binary data.
Merged trunk into branch.

Location:

branches/HivePerformance/sources

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (5 diffs)

branches/HivePerformance/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/HiveJobManagerView.cs

@@ -119 +119 @@
 
     protected override void OnClosing(FormClosingEventArgs e) {
-      if (Content != null && Content.Jobs.Any(x => x.IsProgressing)) {
+      if (Content != null && Content.Jobs != null && Content.Jobs.Any(x => x.IsProgressing)) {
         DialogResult result = MessageBox.Show("There are still unfinished down/uploads. Are you sure you want to close the window?", "HeuristicLab Hive Job Manager", MessageBoxButtons.YesNo, MessageBoxIcon.Question);
 
@@ -131 +131 @@
 
     protected override void OnClosed(FormClosedEventArgs e) {
-      if (Content != null) {
+      if (Content != null && Content.Jobs != null) {
         Content.ClearHiveClient();
         Content = null;

branches/HivePerformance/sources/HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs

@@ -76 +76 @@
       Content.ExecutionStateChanged += new EventHandler(Content_ExecutionStateChanged);
       Content.ExecutionTimeChanged += new EventHandler(Content_ExecutionTimeChanged);
-      Content.IsAllowedPrivilegedChanged += new EventHandler(Content_IsAllowedPrivilegedChanged);
       Content.Loaded += new EventHandler(Content_Loaded);
       Content.TaskReceived += new EventHandler(Content_TaskReceived);
@@ -145 +144 @@
           executionTimeTextBox.Text = Content.ExecutionTime.ToString();
           resourceNamesTextBox.Text = Content.Job.ResourceNames;
-          isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;
+          isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
           refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
           logView.Content = Content.Log;
@@ -327 +326 @@
         runCollectionViewHost.Content = GetAllRunsFromJob(Content);
       }
+      isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
     }
 
@@ -368 +368 @@
       else {
         UpdateStateLogList();
-      }
-    }
-    private void Content_IsAllowedPrivilegedChanged(object sender, EventArgs e) {
-      if (InvokeRequired)
-        Invoke(new EventHandler(Content_IsAllowedPrivilegedChanged), sender, e);
-      else {
-        isPrivilegedCheckBox.Checked = Content.IsAllowedPrivileged;
-        SetEnabledStateOfControls();
       }
     }
@@ -478 +470 @@
 
     private void isPrivilegedCheckBox_CheckChanged(object sender, EventArgs e) {
-      if (Content != null && !SuppressEvents) Content.IsAllowedPrivileged = isPrivilegedCheckBox.Checked;
+      if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
     }