Changeset 12861 for branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

Timestamp:

08/13/15 16:19:51 (9 years ago)

Author:

ascheibe

Message:

#2388 removed old code and switched to new code

File:

• branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs (modified) (6 diffs)

branches/HiveStatistics/sources/HeuristicLab.Services.Hive/3.3/ServiceLocator.cs

@@ -26 +26 @@
 
 namespace HeuristicLab.Services.Hive {
-
   public class ServiceLocator : IServiceLocator {
     private static IServiceLocator instance;
@@ -43 +42 @@
                             : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
         return new PersistenceManager(dataContext);
-      }
-    }
-
-    private IHiveDao hiveDao;
-    public IHiveDao HiveDao {
-      get {
-        if (hiveDao == null) hiveDao = new HiveDao();
-        return hiveDao;
-      }
-    }
-
-    public IOptimizedHiveDao OptimizedHiveDao {
-      get {
-        var dataContext = HiveOperationContext.Current != null
-                            ? HiveOperationContext.Current.DataContext
-                            : new HiveDataContext(Settings.Default.HeuristicLab_Hive_LinqConnectionString);
-        return new OptimizedHiveDao(dataContext);
       }
     }
@@ -82 +64 @@
     public IEventManager EventManager {
       get {
-        if (eventManager == null) eventManager = new NewEventManager();
+        if (eventManager == null) eventManager = new EventManager();
         return eventManager;
       }
@@ -92 +74 @@
     }
 
-    private ITransactionManager transactionManager;
-    public ITransactionManager TransactionManager {
-      get {
-        if (transactionManager == null) transactionManager = new TransactionManager();
-        return transactionManager;
-      }
-    }
-
     private Access.IUserManager userManager;
     public Access.IUserManager UserManager {
@@ -105 +79 @@
         if (userManager == null) userManager = new Access.UserManager();
         return userManager;
-      }
-    }
-
-    private NewHeartbeatManager newheartbeatManager;
-    public NewHeartbeatManager NewHeartbeatManager {
-      get {
-        if (newheartbeatManager == null) newheartbeatManager = new NewHeartbeatManager();
-        return newheartbeatManager;
       }
     }
@@ -131 +97 @@
       }
     }
-
-    private ITaskScheduler newtaskScheduler;
-    public ITaskScheduler NewTaskScheduler {
-      get {
-        if (newtaskScheduler == null) newtaskScheduler = new RoundRobinTaskScheduler();
-        return newtaskScheduler;
-      }
-    }
   }
 }