Changeset 5055 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs

Timestamp:

12/07/10 11:19:33 (14 years ago)

Author:

cneumuel

Message:

#1233

• added test project

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs (modified) (2 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ServiceLocator.cs

@@ -22 +22 @@
 using HeuristicLab.Services.Hive.Common.ServiceContracts;
 using HeuristicLab.Clients.Hive.Properties;
+using HeuristicLab.Clients.Common;
 
 namespace HeuristicLab.Clients.Hive {
-  public class ServiceLocator {
-    private static ServiceLocator instance = null;
-    private ServiceClientFactory<IHiveService> serviceFactory = null;
-
-    public static ServiceLocator Instance {
+  public class ServiceLocator : IServiceLocator {
+    private static IServiceLocator instance = null;
+    public static IServiceLocator Instance {
       get {
         if (instance == null) {
@@ -35 +34 @@
         return instance;
       }
-    }
-
-    public ServiceLocator() {
-      Settings.Default.SettingChanging += new System.Configuration.SettingChangingEventHandler(Default_SettingChanging);
-    }
-
-    private void Default_SettingChanging(object sender, System.Configuration.SettingChangingEventArgs e) {
-      if (serviceFactory != null) {
-        serviceFactory.Username = Settings.Default.HiveUsername;
-        serviceFactory.Password = Settings.Default.HivePassword;
+      set {
+        instance = value;
       }
     }
 
-    public ServiceClientFactory<IHiveService> ServicePool {
-      get {
-        if (serviceFactory == null) {
-          serviceFactory = new ServiceClientFactory<IHiveService>(Settings.Default.HiveUsername, Settings.Default.HivePassword, "wsHttpBinding_IHiveService");
-        }
-        return serviceFactory;
-      }
+    public Disposable<IHiveService> GetService() {
+        return ClientFactory.CreateClient<IHiveService>("wsHttpBinding_IHiveService");
     }
   }