Changeset 12963 for stable/HeuristicLab.Clients.Hive/3.3/ServiceClients

Timestamp:

09/21/15 16:35:55 (9 years ago)

Author:

ascheibe

Message:

#2355 merged r12926, r12927 and r12959 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs (modified) (4 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs (modified) (2 diffs)
• HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs (modified) (1 diff)

stable/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

@@ -351 +351 @@
         
         [System.Runtime.Serialization.OptionalFieldAttribute()]
-        private bool IsPrivilegedField;
-        
-        [System.Runtime.Serialization.OptionalFieldAttribute()]
         private System.Guid JobIdField;
         
@@ -415 +412 @@
                     this.IsParentTaskField = value;
                     this.RaisePropertyChanged("IsParentTask");
-                }
-            }
-        }
-        
-        [System.Runtime.Serialization.DataMemberAttribute()]
-        public bool IsPrivileged
-        {
-            get
-            {
-                return this.IsPrivilegedField;
-            }
-            set
-            {
-                if ((this.IsPrivilegedField.Equals(value) != true))
-                {
-                    this.IsPrivilegedField = value;
-                    this.RaisePropertyChanged("IsPrivileged");
                 }
             }
@@ -2553 +2533 @@
         System.Collections.Generic.List<HeuristicLab.Clients.Hive.JobPermission> GetJobPermissions(System.Guid jobId);
         
-        [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/IsAllowedPrivileged", ReplyAction="http://tempuri.org/IHiveService/IsAllowedPrivilegedResponse")]
-        bool IsAllowedPrivileged();
-        
         [System.ServiceModel.OperationContractAttribute(Action="http://tempuri.org/IHiveService/Hello", ReplyAction="http://tempuri.org/IHiveService/HelloResponse")]
         void Hello(HeuristicLab.Clients.Hive.Slave slave);
@@ -2882 +2859 @@
         }
         
-        public bool IsAllowedPrivileged()
-        {
-            return base.Channel.IsAllowedPrivileged();
-        }
-        
         public void Hello(HeuristicLab.Clients.Hive.Slave slave)
         {

stable/HeuristicLab.Clients.Hive/3.3/ServiceClients/Job.cs

@@ -27 +27 @@
   public partial class Job : IDeepCloneable, IContent {
 
-    private bool isPrivileged;
-    public bool IsPrivileged {
-      get { return isPrivileged; }
-      set { isPrivileged = value; }
-    }
-
     #region Constructors and Cloning
     public Job() {
@@ -48 +42 @@
       this.Description = original.Description;
       this.Id = original.Id;
-      this.IsPrivileged = original.IsPrivileged;
       this.Permission = original.Permission;
     }

stable/HeuristicLab.Clients.Hive/3.3/ServiceClients/Task.cs

@@ -43 +43 @@
       this.FinishWhenChildJobsFinished = original.FinishWhenChildJobsFinished;
       this.JobId = original.JobId;
-      this.IsPrivileged = original.IsPrivileged;
     }