Changeset 8914

Timestamp:

11/15/12 14:08:11 (12 years ago)

Author:

ascheibe

Message:

#1950

• fixed nasty permission exception: refresh automatically can only be activated after the job is actually uploaded to the server
• fixed setting refresh automatically correctly when switching between jobs

Location:

trunk/sources

Files:

• HeuristicLab.Clients.Hive.JobManager/3.3/Views/RefreshableHiveJobView.cs (modified) (3 diffs)
• HeuristicLab.Clients.Hive/3.3/HiveClient.cs (modified) (1 diff)
• HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs (modified) (1 diff)

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

@@ -45 +45 @@
     private ProgressView progressView;
     private HiveResourceSelectorDialog hiveResourceSelectorDialog;
+    private bool SuppressEvents { get; set; }
 
     public new RefreshableJob Content {
@@ -122 +123 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null) {
-        nameTextBox.Text = string.Empty;
-        executionTimeTextBox.Text = string.Empty;
-        resourceNamesTextBox.Text = string.Empty;
-        isPrivilegedCheckBox.Checked = false;
-        logView.Content = null;
-        refreshAutomaticallyCheckBox.Checked = false;
-        runCollectionViewHost.Content = null;
-      } else {
-        nameTextBox.Text = Content.Job.Name;
-        executionTimeTextBox.Text = Content.ExecutionTime.ToString();
-        resourceNamesTextBox.Text = Content.Job.ResourceNames;
-        isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
-        refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
-        logView.Content = Content.Log;
-        runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+      SuppressEvents = true;
+      try {
+        if (Content == null) {
+          nameTextBox.Text = string.Empty;
+          executionTimeTextBox.Text = string.Empty;
+          resourceNamesTextBox.Text = string.Empty;
+          isPrivilegedCheckBox.Checked = false;
+          logView.Content = null;
+          refreshAutomaticallyCheckBox.Checked = false;
+          runCollectionViewHost.Content = null;
+        } else {
+          nameTextBox.Text = Content.Job.Name;
+          executionTimeTextBox.Text = Content.ExecutionTime.ToString();
+          resourceNamesTextBox.Text = Content.Job.ResourceNames;
+          isPrivilegedCheckBox.Checked = Content.Job.IsPrivileged;
+          refreshAutomaticallyCheckBox.Checked = Content.RefreshAutomatically;
+          logView.Content = Content.Log;
+          runCollectionViewHost.Content = GetAllRunsFromJob(Content);
+        }
+      }
+      finally {
+        SuppressEvents = false;
       }
       hiveExperimentPermissionListView.Content = null; // has to be filled by refresh button
@@ -428 +435 @@
 
     private void refreshAutomaticallyCheckBox_CheckedChanged(object sender, EventArgs e) {
-      if (Content != null) Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
+      if (Content != null && !SuppressEvents) Content.RefreshAutomatically = refreshAutomaticallyCheckBox.Checked;
     }
 
     private void isPrivilegedCheckBox_Validated(object sender, EventArgs e) {
-      if (Content != null) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
+      if (Content != null && !SuppressEvents) Content.Job.IsPrivileged = isPrivilegedCheckBox.Checked;
     }
 

trunk/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -294 +294 @@
         cancellationToken.ThrowIfCancellationRequested();
 
-        if (refreshableJob.RefreshAutomatically) refreshableJob.StartResultPolling();
+        refreshableJob.RefreshAutomatically = true;
+        refreshableJob.StartResultPolling();
 
         // upload tasks

trunk/sources/HeuristicLab.Clients.Hive/3.3/RefreshableJob.cs

@@ -189 +189 @@
     #region Constructors and Cloning
     public RefreshableJob() {
-      this.refreshAutomatically = true;
+      this.refreshAutomatically = false;
       this.Job = new Job();
       this.log = new ThreadSafeLog();