Changeset 9436

Timestamp:

05/03/13 23:20:36 (11 years ago)

Author:

ascheibe

Message:

#1950 removed IsAllowedPrivileged property from RefreshableJob as it's not needed anymore

Location:

trunk/sources

Files:

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

trunk/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;
     }
 

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

@@ -113 +113 @@
 
         foreach (var j in jobsLoaded) {
-          jobs.Add(new RefreshableJob(j) { IsAllowedPrivileged = this.isAllowedPrivileged });
+          jobs.Add(new RefreshableJob(j));
         }
       }
@@ -452 +452 @@
         IDictionary<Guid, HiveTask> allHiveTasks = downloader.Results;
         var parents = allHiveTasks.Values.Where(x => !x.Task.ParentTaskId.HasValue);
+        refreshableJob.Job.IsPrivileged = allHiveTasks.Any(x => x.Value.Task.IsPrivileged);
 
         refreshableJob.Progress.Status = "Downloading/deserializing complete. Displaying tasks...";

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

@@ -157 +157 @@
     }
 
-    // may execute jobs with privileged permissions on slaves
-    public bool IsAllowedPrivileged {
-      get { return Job.IsPrivileged; }
-      set {
-        if (value != Job.IsPrivileged) {
-          Job.IsPrivileged = value;
-          OnIsAllowedPrivilegedChanged();
-        }
-      }
-    }
-
     private Progress progress;
     public Progress Progress {
@@ -196 +185 @@
       this.HiveTasks = new ItemCollection<HiveTask>();
     }
-    public RefreshableJob(Job hiveExperiment) {
+    public RefreshableJob(Job hiveJob) {
       this.refreshAutomatically = true;
-      this.Job = hiveExperiment;
+      this.Job = hiveJob;
       this.log = new ThreadSafeLog();
       this.jobDownloader = new ConcurrentTaskDownloader<ItemTask>(Settings.Default.MaxParallelDownloads, Settings.Default.MaxParallelDownloads);
@@ -433 +422 @@
     }
 
-    public event EventHandler IsAllowedPrivilegedChanged;
-    private void OnIsAllowedPrivilegedChanged() {
-      var handler = IsAllowedPrivilegedChanged;
-      if (handler != null) handler(this, EventArgs.Empty);
-    }
-
     public event EventHandler JobStatisticsChanged;
     private void OnJobStatisticsChanged() {