Changeset 5294

Timestamp:

01/14/11 00:43:03 (14 years ago)

Author:

cneumuel

Message:

#1260

• changed VS2008ImageLibrary to VSImageLibrary

Location:

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive

Files:

• HeuristicLab.Hive 3.3.sln (modified) (2 diffs)
• HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs (modified) (1 diff)
• HeuristicLab.HiveEngine/3.3/OperationJob.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive 3.3.sln

@@ -29 +29 @@
     ConfigMerger.exe = ConfigMerger.exe
     HeuristicLab 3.3.vsmdi = HeuristicLab 3.3.vsmdi
-    HeuristicLab.Hive 3.33.vsmdi = HeuristicLab.Hive 3.33.vsmdi
+    HeuristicLab.Hive 3.34.vsmdi = HeuristicLab.Hive 3.34.vsmdi
     LocalTestRun.testrunconfig = LocalTestRun.testrunconfig
     PreBuildEvent.cmd = PreBuildEvent.cmd
@@ -108 +108 @@
 Global
   GlobalSection(TestCaseManagementSettings) = postSolution
-    CategoryFile = HeuristicLab.Hive 3.33.vsmdi
+    CategoryFile = HeuristicLab.Hive 3.34.vsmdi
   EndGlobalSection
   GlobalSection(SolutionConfigurationPlatforms) = preSolution

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.Hive.ExperimentManager/3.3/HiveJob.cs

@@ -43 +43 @@
       get {
         if (jobDto.Id == Guid.Empty) { // not yet uploaded
-          return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+          return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         } else {
-          if (jobDto.State == JobState.Offline) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-          else if (jobDto.State == JobState.WaitForChildJobs) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutablePrepared;
-          else if (jobDto.State == JobState.Calculating) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStarted;
-          else if (jobDto.State == JobState.Aborted) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
-          else if (jobDto.State == JobState.Failed) return HeuristicLab.Common.Resources.VS2008ImageLibrary.Error;
-          else if (jobDto.State == JobState.Finished) return HeuristicLab.Common.Resources.VS2008ImageLibrary.ExecutableStopped;
-          else return HeuristicLab.Common.Resources.VS2008ImageLibrary.Event;
+          if (jobDto.State == JobState.Offline) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (jobDto.State == JobState.WaitForChildJobs) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutablePrepared;
+          else if (jobDto.State == JobState.Calculating) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStarted;
+          else if (jobDto.State == JobState.Aborted) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          else if (jobDto.State == JobState.Failed) return HeuristicLab.Common.Resources.VSImageLibrary.Error;
+          else if (jobDto.State == JobState.Finished) return HeuristicLab.Common.Resources.VSImageLibrary.ExecutableStopped;
+          else return HeuristicLab.Common.Resources.VSImageLibrary.Event;
         }
       }

branches/HeuristicLab.Hive-3.3/sources/HeuristicLab.Hive/HeuristicLab.HiveEngine/3.3/OperationJob.cs

@@ -118 +118 @@
 
     public override Image ItemImage {
-      get { return HeuristicLab.Common.Resources.VS2008ImageLibrary.Operator; }
+      get { return HeuristicLab.Common.Resources.VSImageLibrary.Operator; }
     }