Changeset 6723 for branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive

Timestamp:

09/08/11 14:37:52 (13 years ago)

Author:

ascheibe

Message:

#1233 Review comments: renamed HiveEperiment to Job

Location:

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

Files:

• HiveClient.cs (modified) (6 diffs)
• RefreshableHiveExperiment.cs (modified) (4 diffs)
• ServiceClients/HiveExperiment.cs (modified) (4 diffs)
• ServiceClients/HiveExperimentPermission.cs (modified) (2 diffs)
• ServiceClients/HiveServiceClient.cs (modified) (13 diffs)
• ServiceClients/Task.cs (modified) (1 diff)
• Util/PluginUtil.cs (modified) (1 diff)

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

@@ -86 +86 @@
         var oldExperiments = hiveExperiments ?? new ItemCollection<RefreshableHiveExperiment>();
         hiveExperiments = new HiveItemCollection<RefreshableHiveExperiment>();
-        var experimentsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<HiveExperiment>>(s => s.GetHiveExperiments());
+        var experimentsLoaded = ServiceLocator.Instance.CallHiveService<IEnumerable<Job>>(s => s.GetHiveExperiments());
 
         foreach (var he in experimentsLoaded) {
@@ -141 +141 @@
           HiveClient.Instance.UploadExperiment((RefreshableHiveExperiment)item, cancellationToken);
         }
-        if (item is HiveExperimentPermission) {
-          var hep = (HiveExperimentPermission)item;
+        if (item is JobPermission) {
+          var hep = (JobPermission)item;
           hep.GrantedUserId = ServiceLocator.Instance.CallHiveService((s) => s.GetUserIdByUsername(hep.GrantedUserName));
           if (hep.GrantedUserId == Guid.Empty) {
             throw new ArgumentException(string.Format("The user {0} was not found.", hep.GrantedUserName));
           }
-          ServiceLocator.Instance.CallHiveService((s) => s.GrantPermission(hep.HiveExperimentId, hep.GrantedUserId, hep.Permission));
+          ServiceLocator.Instance.CallHiveService((s) => s.GrantPermission(hep.JobId, hep.GrantedUserId, hep.Permission));
         }
       } else {
-        if (item is HiveExperiment)
-          ServiceLocator.Instance.CallHiveService(s => s.UpdateHiveExperiment((HiveExperiment)item));
+        if (item is Job)
+          ServiceLocator.Instance.CallHiveService(s => s.UpdateHiveExperiment((Job)item));
       }
     }
@@ -176 +176 @@
         return;
 
-      if (item is HiveExperiment)
+      if (item is Job)
         ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(item.Id));
       if (item is RefreshableHiveExperiment)
         ServiceLocator.Instance.CallHiveService(s => s.DeleteHiveExperiment(item.Id));
-      if (item is HiveExperimentPermission) {
-        var hep = (HiveExperimentPermission)item;
-        ServiceLocator.Instance.CallHiveService(s => s.RevokePermission(hep.HiveExperimentId, hep.GrantedUserId));
+      if (item is JobPermission) {
+        var hep = (JobPermission)item;
+        ServiceLocator.Instance.CallHiveService(s => s.RevokePermission(hep.JobId, hep.GrantedUserId));
       }
       item.Id = Guid.Empty;
@@ -258 +258 @@
         }
 
-        // upload HiveExperiment
-        refreshableHiveExperiment.Progress.Status = "Uploading HiveExperiment...";
+        // upload Job
+        refreshableHiveExperiment.Progress.Status = "Uploading Job...";
         refreshableHiveExperiment.HiveExperiment.Id = ServiceLocator.Instance.CallHiveService((s) => s.AddHiveExperiment(refreshableHiveExperiment.HiveExperiment));
         bool isPrivileged = refreshableHiveExperiment.HiveExperiment.IsPrivileged;
@@ -365 +365 @@
         cancellationToken.ThrowIfCancellationRequested();
         hiveJob.Job.PluginsNeededIds.Add(configPluginId);
-        hiveJob.Job.HiveExperimentId = hiveExperimentId;
+        hiveJob.Job.JobId = hiveExperimentId;
         hiveJob.Job.IsPrivileged = isPrivileged;
 
@@ -506 +506 @@
     }
 
-    public static HiveItemCollection<HiveExperimentPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) {
+    public static HiveItemCollection<JobPermission> GetHiveExperimentPermissions(Guid hiveExperimentId) {
       return ServiceLocator.Instance.CallHiveService((service) => {
-        IEnumerable<HiveExperimentPermission> heps = service.GetHiveExperimentPermissions(hiveExperimentId);
+        IEnumerable<JobPermission> heps = service.GetHiveExperimentPermissions(hiveExperimentId);
         foreach (var hep in heps) {
           hep.GrantedUserName = service.GetUsernameByUserId(hep.GrantedUserId);
         }
-        return new HiveItemCollection<HiveExperimentPermission>(heps);
+        return new HiveItemCollection<JobPermission>(heps);
       });
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/RefreshableHiveExperiment.cs

@@ -35 +35 @@
     private static object locker = new object();
 
-    private HiveExperiment hiveExperiment;
-    public HiveExperiment HiveExperiment {
+    private Job hiveExperiment;
+    public Job HiveExperiment {
       get { return hiveExperiment; }
       set {
@@ -192 +192 @@
     public RefreshableHiveExperiment() {
       this.refreshAutomatically = true;
-      this.HiveExperiment = new HiveExperiment();
+      this.HiveExperiment = new Job();
       this.log = new ThreadSafeLog(new Log());
       this.jobDownloader = new ConcurrentJobDownloader<ItemJob>(2, 2);
@@ -198 +198 @@
       this.HiveJobs = new ItemCollection<HiveJob>();
     }
-    public RefreshableHiveExperiment(HiveExperiment hiveExperiment) {
+    public RefreshableHiveExperiment(Job hiveExperiment) {
       this.refreshAutomatically = true;
       this.HiveExperiment = hiveExperiment;
@@ -350 +350 @@
     #endregion
 
-    #region HiveExperiment Events
+    #region Job Events
     private void RegisterHiveExperimentEvents() {
       hiveExperiment.ToStringChanged += new EventHandler(OnToStringChanged);

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveExperiment.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Clients.Hive {
-  public partial class HiveExperiment : IDeepCloneable, IContent {
+  public partial class Job : IDeepCloneable, IContent {
 
     private bool isPrivileged;
@@ -34 +34 @@
 
     #region Constructors and Cloning
-    public HiveExperiment() {
+    public Job() {
       this.ResourceNames = "HEAL";
       this.DateCreated = DateTime.Now;
@@ -40 +40 @@
     }
 
-    protected HiveExperiment(HiveExperiment original, Cloner cloner) {
+    protected Job(Job original, Cloner cloner) {
       cloner.RegisterClonedObject(original, this);
       this.OwnerUserId = original.OwnerUserId;
@@ -53 +53 @@
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new HiveExperiment(this, cloner);
+      return new Job(this, cloner);
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveExperimentPermission.cs

@@ -24 +24 @@
 
 namespace HeuristicLab.Clients.Hive {
-  public partial class HiveExperimentPermission : IDeepCloneable, IContent {
+  public partial class JobPermission : IDeepCloneable, IContent {
 
     private string grantedUserName;
@@ -38 +38 @@
 
     #region Constructors and Cloning
-    public HiveExperimentPermission() {
+    public JobPermission() {
       this.Permission = Permission.Read;
       this.PropertyChanged += new PropertyChangedEventHandler(HiveExperimentPermission_PropertyChanged);
     }
 
-    protected HiveExperimentPermission(HiveExperimentPermission original, Cloner cloner)
+    protected JobPermission(JobPermission original, Cloner cloner)
       : base(original, cloner) {
       this.GrantedByUserId = original.GrantedByUserId;
       this.GrantedUserId = original.GrantedUserId;
-      this.HiveExperimentId = original.HiveExperimentId;
+      this.JobId = original.JobId;
       this.Permission = original.Permission;
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new HiveExperimentPermission(this, cloner);
+      return new JobPermission(this, cloner);
     }
     #endregion

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

@@ -20 +20 @@
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Task))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Downtime))]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.HiveExperimentPermission))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.JobPermission))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.PluginData))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.NamedHiveItem))]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.HiveExperiment))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Resource))]
@@ -281 +281 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
-    private System.Guid HiveExperimentIdField;
-
-    [System.Runtime.Serialization.OptionalFieldAttribute()]
     private bool IsParentJobField;
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
     private bool IsPrivilegedField;
+
+    [System.Runtime.Serialization.OptionalFieldAttribute()]
+    private System.Guid JobIdField;
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -328 +328 @@
 
     [System.Runtime.Serialization.DataMemberAttribute()]
-    public System.Guid HiveExperimentId {
-      get {
-        return this.HiveExperimentIdField;
-      }
-      set {
-        if ((this.HiveExperimentIdField.Equals(value) != true)) {
-          this.HiveExperimentIdField = value;
-          this.RaisePropertyChanged("HiveExperimentId");
-        }
-      }
-    }
-
-    [System.Runtime.Serialization.DataMemberAttribute()]
     public bool IsParentJob {
       get {
@@ -367 +354 @@
 
     [System.Runtime.Serialization.DataMemberAttribute()]
+    public System.Guid JobId {
+      get {
+        return this.JobIdField;
+      }
+      set {
+        if ((this.JobIdField.Equals(value) != true)) {
+          this.JobIdField = value;
+          this.RaisePropertyChanged("JobId");
+        }
+      }
+    }
+
+    [System.Runtime.Serialization.DataMemberAttribute()]
     public System.Nullable<System.DateTime> LastHeartbeat {
       get {
@@ -524 +524 @@
   [System.Diagnostics.DebuggerStepThroughAttribute()]
   [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-  [System.Runtime.Serialization.DataContractAttribute(Name = "HiveExperimentPermission", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "JobPermission", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
   [System.SerializableAttribute()]
-  public partial class HiveExperimentPermission : HeuristicLab.Clients.Hive.HiveItem {
+  public partial class JobPermission : HeuristicLab.Clients.Hive.HiveItem {
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -535 +535 @@
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
-    private System.Guid HiveExperimentIdField;
+    private System.Guid JobIdField;
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -567 +567 @@
 
     [System.Runtime.Serialization.DataMemberAttribute()]
-    public System.Guid HiveExperimentId {
-      get {
-        return this.HiveExperimentIdField;
-      }
-      set {
-        if ((this.HiveExperimentIdField.Equals(value) != true)) {
-          this.HiveExperimentIdField = value;
-          this.RaisePropertyChanged("HiveExperimentId");
+    public System.Guid JobId {
+      get {
+        return this.JobIdField;
+      }
+      set {
+        if ((this.JobIdField.Equals(value) != true)) {
+          this.JobIdField = value;
+          this.RaisePropertyChanged("JobId");
         }
       }
@@ -652 +652 @@
   [System.Runtime.Serialization.DataContractAttribute(Name = "NamedHiveItem", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
   [System.SerializableAttribute()]
-  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.HiveExperiment))]
+  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Job))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Plugin))]
   [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Resource))]
@@ -694 +694 @@
   [System.Diagnostics.DebuggerStepThroughAttribute()]
   [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
-  [System.Runtime.Serialization.DataContractAttribute(Name = "HiveExperiment", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
+  [System.Runtime.Serialization.DataContractAttribute(Name = "Job", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
   [System.SerializableAttribute()]
-  public partial class HiveExperiment : HeuristicLab.Clients.Hive.NamedHiveItem {
+  public partial class Job : HeuristicLab.Clients.Hive.NamedHiveItem {
 
     [System.Runtime.Serialization.OptionalFieldAttribute()]
@@ -1648 +1648 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/GetHiveExperimentResponse")]
-    HeuristicLab.Clients.Hive.HiveExperiment GetHiveExperiment(System.Guid id);
+    HeuristicLab.Clients.Hive.Job GetHiveExperiment(System.Guid id);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetHiveExperiments", ReplyAction = "http://tempuri.org/IHiveService/GetHiveExperimentsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetHiveExperiments();
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetHiveExperiments();
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetAllHiveExperiments", ReplyAction = "http://tempuri.org/IHiveService/GetAllHiveExperimentsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetAllHiveExperiments();
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetAllHiveExperiments();
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/AddHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/AddHiveExperimentResponse")]
-    System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.HiveExperiment hiveExperimentDto);
+    System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/UpdateHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/UpdateHiveExperimentResponse")]
-    void UpdateHiveExperiment(HeuristicLab.Clients.Hive.HiveExperiment hiveExperimentDto);
+    void UpdateHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/DeleteHiveExperiment", ReplyAction = "http://tempuri.org/IHiveService/DeleteHiveExperimentResponse")]
@@ -1672 +1672 @@
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/GetHiveExperimentPermissions", ReplyAction = "http://tempuri.org/IHiveService/GetHiveExperimentPermissionsResponse")]
-    System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperimentPermission> GetHiveExperimentPermissions(System.Guid hiveExperimentId);
+    System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetHiveExperimentPermissions(System.Guid hiveExperimentId);
 
     [System.ServiceModel.OperationContractAttribute(Action = "http://tempuri.org/IHiveService/IsAllowedPrivileged", ReplyAction = "http://tempuri.org/IHiveService/IsAllowedPrivilegedResponse")]
@@ -1874 +1874 @@
     }
 
-    public HeuristicLab.Clients.Hive.HiveExperiment GetHiveExperiment(System.Guid id) {
+    public HeuristicLab.Clients.Hive.Job GetHiveExperiment(System.Guid id) {
       return base.Channel.GetHiveExperiment(id);
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetHiveExperiments() {
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetHiveExperiments() {
       return base.Channel.GetHiveExperiments();
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperiment> GetAllHiveExperiments() {
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.Job> GetAllHiveExperiments() {
       return base.Channel.GetAllHiveExperiments();
     }
 
-    public System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.HiveExperiment hiveExperimentDto) {
+    public System.Guid AddHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto) {
       return base.Channel.AddHiveExperiment(hiveExperimentDto);
     }
 
-    public void UpdateHiveExperiment(HeuristicLab.Clients.Hive.HiveExperiment hiveExperimentDto) {
+    public void UpdateHiveExperiment(HeuristicLab.Clients.Hive.Job hiveExperimentDto) {
       base.Channel.UpdateHiveExperiment(hiveExperimentDto);
     }
@@ -1906 +1906 @@
     }
 
-    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.HiveExperimentPermission> GetHiveExperimentPermissions(System.Guid hiveExperimentId) {
+    public System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetHiveExperimentPermissions(System.Guid hiveExperimentId) {
       return base.Channel.GetHiveExperimentPermissions(hiveExperimentId);
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

@@ -38 +38 @@
       this.IsParentJob = original.IsParentJob;
       this.FinishWhenChildJobsFinished = original.FinishWhenChildJobsFinished;
-      this.HiveExperimentId = original.HiveExperimentId;
+      this.JobId = original.JobId;
       this.IsPrivileged = original.IsPrivileged;
     }

branches/HeuristicLab.Hive-3.4/sources/HeuristicLab.Clients.Hive/3.3/Util/PluginUtil.cs

@@ -36 +36 @@
     /// <param name="service">An active service-proxy</param>
     /// <param name="onlinePlugins">List of plugins which are available online</param>
-    /// <param name="alreadyUploadedPlugins">List of plugins which have been uploaded from this HiveExperiment</param>
+    /// <param name="alreadyUploadedPlugins">List of plugins which have been uploaded from this Job</param>
     /// <param name="neededPlugins">List of plugins which need to be uploaded</param>
     /// <returns></returns>