Changeset 5526 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentManagerClient.cs

Timestamp:

02/21/11 17:35:42 (14 years ago)

Author:

cneumuel

Message:

#1233

• fixed handling of StateLog in DataLayer
• extended unit tests
• changed style of service calls to OKB-like style (using delegates)
• added possibility that parent jobs can be finished immediately when child jobs are finished

File:

• branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentManagerClient.cs (modified) (3 diffs)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.4/ExperimentManager/HiveExperimentManagerClient.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HeuristicLab.Collections;
 using HeuristicLab.Core;
-using HeuristicLab.Services.Hive.Common.ServiceContracts;
-using HeuristicLab.Services.Hive.Common;
-using System.Collections.Generic;
 
 namespace HeuristicLab.Clients.Hive {
+  using HeuristicLab.Common;
   using DT = HeuristicLab.Services.Hive.Common.DataTransfer;
-  using HeuristicLab.Common;
-  using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-  using HeuristicLab.Clients.Common;
 
   [Item("Hive Client", "Connects to Hive and lists all submitted experiments by the current user.")]
@@ -97 +93 @@
           this.HiveExperiments = new ItemList<HiveExperimentClient>();
         }
-        using (var service = ServiceLocator.Instance.GetService()) {
-          currentlyUpdating = true;
-          IEnumerable<DT.HiveExperiment> response = service.Obj.GetHiveExperiments();
-          progress.Status = "Populating HiveExperiment list...";
-          RefreshExperimentList(response);
-          currentlyUpdating = false;
-        }
+        currentlyUpdating = true;
+        IEnumerable<DT.HiveExperiment> response = ServiceLocator.Instance.CallHiveService(s => s.GetHiveExperiments());
+        progress.Status = "Populating HiveExperiment list...";
+        RefreshExperimentList(response);
+        currentlyUpdating = false;
       }
       catch (Exception) {
@@ -137 +131 @@
     }
 
-    void hiveExperiments_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveExperimentClient>> e) {
+    private void hiveExperiments_ItemsRemoved(object sender, CollectionItemsChangedEventArgs<IndexedItem<HiveExperimentClient>> e) {
       if (!currentlyUpdating) {
-        using (Disposable<IHiveService> service = ServiceLocator.Instance.GetService()) {
+        ServiceLocator.Instance.CallHiveService(service => {
           foreach (IndexedItem<HiveExperimentClient> item in e.Items) {
             if (item.Value.HiveExperimentId != Guid.Empty) {
-              service.Obj.DeleteHiveExperiment(item.Value.HiveExperimentId);
+              service.DeleteHiveExperiment(item.Value.HiveExperimentId);
             }
           }
-        }
+        });
       }
     }