Changeset 4264 for branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

Timestamp:

08/19/10 13:30:56 (14 years ago)

Author:

cneumuel

Message:

Split up "State" to "JobState" and "SlaveState" (#1159)

File:

• branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs (modified) (8 diffs)

branches/3.3-HiveMigration/sources/HeuristicLab.Hive/HeuristicLab.Hive.Server.Console/3.3/HiveServerManagementConsole.cs

@@ -110 +110 @@
     void jdf_NewDataAvailable(object sender, EventArgs e) {
       JobDataFetcher fetcher = (JobDataFetcher) sender;
-      if (fetcher.PollStates.Contains(State.Finished)) {
-        updateJobListView(fetcher, lv_finishedJobs, 0);
-      } else if(fetcher.PollStates.Contains(State.Calculating)) {
-        updateJobListView(fetcher, lv_calculatingJobs, 1);
-      } else if (fetcher.PollStates.Contains(State.Offline)) {
-        updateJobListView(fetcher, lv_offlineJobs, 2);
-      }
-    }
-
-    private void updateJobListView(JobDataFetcher fetcher, ListView listView, int category) {
+      if (fetcher.PollStates.Contains(JobState.Finished)) {
+        UpdateJobListView(fetcher, lv_finishedJobs, 0);
+      } else if(fetcher.PollStates.Contains(JobState.Calculating)) {
+        UpdateJobListView(fetcher, lv_calculatingJobs, 1);
+      } else if (fetcher.PollStates.Contains(JobState.Offline)) {
+        UpdateJobListView(fetcher, lv_offlineJobs, 2);
+      }
+    }
+
+    private void UpdateJobListView(JobDataFetcher fetcher, ListView listView, int category) {
       if (listView.InvokeRequired) {
-        listView.Invoke(new updateListView(updateJobListView), new object[] { fetcher, listView, category });
+        listView.Invoke(new updateListView(UpdateJobListView), new object[] { fetcher, listView, category });
       } else {
         listView.BeginUpdate();
@@ -137 +137 @@
     private void Init() {
 
-      jdfFinished = new JobDataFetcher(new State[] {State.Finished}, 50);
-      jdfCalculating = new JobDataFetcher(new State[] {State.Calculating}, 50);
-      jdfOffline = new JobDataFetcher(new State[] {State.Offline}, 50);
+      jdfFinished = new JobDataFetcher(new JobState[] {JobState.Finished}, 50);
+      jdfCalculating = new JobDataFetcher(new JobState[] {JobState.Calculating}, 50);
+      jdfOffline = new JobDataFetcher(new JobState[] {JobState.Offline}, 50);
 
       cmb_finishedJob_count.SelectedItem = "50";
@@ -348 +348 @@
           int percentageUsage = CapacityRam(((ClientDto)resource).NrOfCores, ((ClientDto)resource).NrOfFreeCores);
           int usage = 3;
-          if ((((ClientDto)resource).State != State.Offline) &&
-            (((ClientDto)resource).State != State.NullState)) {
+          if ((((ClientDto)resource).State != SlaveState.Offline) &&
+            (((ClientDto)resource).State != SlaveState.NullState)) {
             if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
               usage = 0;
@@ -419 +419 @@
       //lvSnapshots.Enabled = true;
 
-      if (job.State == State.Offline) {
+      if (job.State == JobState.Offline) {
         pbJobControl.Image = ilLargeImgJob.Images[2];
-      } else if (job.State == State.Calculating) {
+      } else if (job.State == JobState.Calculating) {
         pbJobControl.Image = ilLargeImgJob.Images[1];
-      } else if (job.State == State.Finished) {
+      } else if (job.State == JobState.Finished) {
         pbJobControl.Image = ilLargeImgJob.Images[0];
       }
@@ -480 +480 @@
         lvJobDetails.Items.Add(lvi);
 
-        if (job.State == State.Finished) {
+        if (job.State == JobState.Finished) {
           lvi = null;
             lvi = new ListViewItem();
@@ -500 +500 @@
         int percentageUsage = CapacityRam(currentClient.NrOfCores, currentClient.NrOfFreeCores);
         int usage = 3;
-        if ((currentClient.State != State.Offline) && (currentClient.State != State.NullState)) {
+        if ((currentClient.State != SlaveState.Offline) && (currentClient.State != SlaveState.NullState)) {
           if ((percentageUsage >= 0) && (percentageUsage <= 25)) {
             usage = 0;
@@ -630 +630 @@
         JobDto selectedJob = (JobDto)jlv.SelectedItems[0].Tag;
 
-        if (selectedJob != null && selectedJob.State == State.Calculating) {
+        if (selectedJob != null && selectedJob.State == JobState.Calculating) {
           jlv.ContextMenuStrip.Items.Add(offlineItemAbortJob);
           jlv.ContextMenuStrip.Items.Add(menuItemGetSnapshot);
@@ -806 +806 @@
               change = true;
             }
-            if (job.State != State.Offline) {
+            if (job.State != JobState.Offline) {
               if ((!IsEqual(job.Client, jobold.Client)) || (job.State != jobold.State)
                    || (job.Percentage != jobold.Percentage)) {