Changeset 7137

Timestamp:

12/06/11 17:14:03 (13 years ago)

Author:

ascheibe

Message:

#1215 renamed ServiceLocator to HiveServiceLocator

Location:

branches/HeuristicLab.MetaOptimization

Files:

• HeuristicLab.HiveEngine/3.3/HiveEngine.cs (modified) (4 diffs)
• HeuristicLab.MetaOptimization.Test/Program.cs (modified) (2 diffs)

branches/HeuristicLab.MetaOptimization/HeuristicLab.HiveEngine/3.3/HiveEngine.cs

@@ -99 +99 @@
       this.Priority = 0;
       this.log = new ThreadSafeLog();
-      this.IsAllowedPrivileged = ServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
+      this.IsAllowedPrivileged = HiveServiceLocator.Instance.CallHiveService((s) => s.IsAllowedPrivileged());
     }
 
@@ -144 +144 @@
       if (firstRun) {
         TaskScheduler.UnobservedTaskException += new EventHandler<UnobservedTaskExceptionEventArgs>(TaskScheduler_UnobservedTaskException);
-        this.OnlinePlugins = ServiceLocator.Instance.CallHiveService(s => s.GetPlugins()).Where(x => x.Hash != null).ToList();
+        this.OnlinePlugins = HiveServiceLocator.Instance.CallHiveService(s => s.GetPlugins()).Where(x => x.Hash != null).ToList();
         this.AlreadyUploadedPlugins = new List<Plugin>();
         firstRun = false;
@@ -288 +288 @@
         log.LogException(e);
         throw e;
-      }
-      finally {
+      } finally {
         DisposeJob(refreshableJob);
       }
@@ -323 +322 @@
     private void DeleteHiveExperiment(Guid jobId) {
       HiveClient.TryAndRepeat(() => {
-        ServiceLocator.Instance.CallHiveService(s => s.DeleteJob(jobId));
+        HiveServiceLocator.Instance.CallHiveService(s => s.DeleteJob(jobId));
       }, 5, string.Format("Could not delete jobs"));
     }
 
     private List<Guid> GetResourceIds() {
-      return ServiceLocator.Instance.CallHiveService(service => {
+      return HiveServiceLocator.Instance.CallHiveService(service => {
         var resourceNames = ResourceNames.Split(';');
         var resourceIds = new List<Guid>();

branches/HeuristicLab.MetaOptimization/HeuristicLab.MetaOptimization.Test/Program.cs

@@ -128 +128 @@
       vc.Parameterize(value);
       Console.WriteLine("P1=33;; " + value.ToString());
-            
+
       Console.ReadLine();
     }
@@ -766 +766 @@
     //  GeneticAlgorithm metaLevelAlgorithm = GetParallelMetaGA(metaOptimizationProblem);
     //  metaLevelAlgorithm.Engine = new HiveEngine.HiveEngine();
-    //  ServiceLocator.Instance.ClientFacadePool.UserName = "cneumuel";
-    //  ServiceLocator.Instance.ClientFacadePool.Password = "cneumuel";
-    //  ServiceLocator.Instance.StreamedClientFacadePool.UserName = "cneumuel";
-    //  ServiceLocator.Instance.StreamedClientFacadePool.Password = "cneumuel";
+    //  HiveServiceLocator.Instance.ClientFacadePool.UserName = "cneumuel";
+    //  HiveServiceLocator.Instance.ClientFacadePool.Password = "cneumuel";
+    //  HiveServiceLocator.Instance.StreamedClientFacadePool.UserName = "cneumuel";
+    //  HiveServiceLocator.Instance.StreamedClientFacadePool.Password = "cneumuel";
     //  return metaLevelAlgorithm;
     //}