Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
05/04/17 17:19:35 (7 years ago)
Author:
gkronber
Message:

#2520: changed all usages of StorableClass to use StorableType with an auto-generated GUID (did not add StorableType to other type definitions yet)

Location:
branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3
Files:
16 edited

Legend:

Unmodified
Added
Removed
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/ConcurrentTaskDownloader.cs

    r14185 r14927  
    8686          result = HiveServiceLocator.Instance.CallHiveService(s => s.GetTaskData(task.Id));
    8787        }, Settings.Default.MaxRepeatServiceCalls, "Failed to download task data.");
    88       }
    89       finally {
     88      } finally {
    9089        downloadSemaphore.Release();
    9190      }
     
    10099        taskData.Item2.Data = null; // reduce memory consumption.
    101100        return new Tuple<Task, T>(taskData.Item1, deserializedJob);
    102       }
    103       finally {
     101      } finally {
    104102        deserializeSemaphore.Release();
    105103      }
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HeuristicLab.Clients.Hive-3.3.csproj

    r14926 r14927  
    239239      <Private>False</Private>
    240240    </ProjectReference>
     241    <ProjectReference Include="..\..\HeuristicLab.Persistence\3.3\HeuristicLab.Persistence-3.3.csproj">
     242      <Project>{102bc7d3-0ef9-439c-8f6d-96ff0fdb8e1b}</Project>
     243      <Name>HeuristicLab.Persistence-3.3</Name>
     244    </ProjectReference>
    241245    <ProjectReference Include="..\..\HeuristicLab.Persistence\4.0\HeuristicLab.Persistence-4.0.csproj">
    242246      <Project>{b1663091-8156-4deb-9e37-5b19810a4644}</Project>
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HiveAdminClient.cs

    r14185 r14927  
    8383          service.GetSlaves().ForEach(s => resources.Add(s));
    8484        });
    85       }
    86       catch {
     85      } catch {
    8786        throw;
    88       }
    89       finally {
     87      } finally {
    9088        OnRefreshed();
    9189      }
     
    104102            service.GetDowntimesForResource(downtimeForResourceId).ForEach(d => downtimes.Add(d));
    105103          });
    106         }
    107         catch {
     104        } catch {
    108105          throw;
    109         }
    110         finally {
     106        } finally {
    111107          OnRefreshed();
    112108        }
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HiveClient.cs

    r14901 r14927  
    9999          jobs.Add(new RefreshableJob(j));
    100100        }
    101       }
    102       catch {
     101      } catch {
    103102        jobs = null;
    104103        throw;
    105       }
    106       finally {
     104      } finally {
    107105        OnRefreshed();
    108106      }
     
    110108
    111109    public void RefreshAsync(Action<Exception> exceptionCallback) {
    112       var call = new Func<Exception>(delegate() {
     110      var call = new Func<Exception>(delegate () {
    113111        try {
    114112          Refresh();
    115         }
    116         catch (Exception ex) {
     113        } catch (Exception ex) {
    117114          return ex;
    118115        }
    119116        return null;
    120117      });
    121       call.BeginInvoke(delegate(IAsyncResult result) {
     118      call.BeginInvoke(delegate (IAsyncResult result) {
    122119        Exception ex = call.EndInvoke(result);
    123120        if (ex != null) exceptionCallback(ex);
     
    146143    }
    147144    public static void StoreAsync(Action<Exception> exceptionCallback, IHiveItem item, CancellationToken cancellationToken) {
    148       var call = new Func<Exception>(delegate() {
     145      var call = new Func<Exception>(delegate () {
    149146        try {
    150147          Store(item, cancellationToken);
    151         }
    152         catch (Exception ex) {
     148        } catch (Exception ex) {
    153149          return ex;
    154150        }
    155151        return null;
    156152      });
    157       call.BeginInvoke(delegate(IAsyncResult result) {
     153      call.BeginInvoke(delegate (IAsyncResult result) {
    158154        Exception ex = call.EndInvoke(result);
    159155        if (ex != null) exceptionCallback(ex);
     
    294290        }
    295291        TS.Task.WaitAll(tasks.ToArray());
    296       }
    297       finally {
     292      } finally {
    298293        refreshableJob.Job.Modified = false;
    299294        refreshableJob.IsProgressing = false;
     
    394389        taskUploadSemaphore.Release(); semaphoreReleased = true; // the semaphore has to be release before waitall!
    395390        TS.Task.WaitAll(tasks.ToArray());
    396       }
    397       finally {
     391      } finally {
    398392        if (!semaphoreReleased) taskUploadSemaphore.Release();
    399393      }
     
    443437        } else if (refreshableJob.IsPaused()) {
    444438          refreshableJob.ExecutionState = Core.ExecutionState.Paused;
    445         } else { 
     439        } else {
    446440          refreshableJob.ExecutionState = Core.ExecutionState.Started;
    447441        }
    448442        refreshableJob.OnLoaded();
    449       }
    450       finally {
     443      } finally {
    451444        refreshableJob.IsProgressing = false;
    452445        refreshableJob.Progress.Finish();
     
    485478      try {
    486479        return PersistenceUtil.Deserialize<ItemTask>(taskData.Data);
    487       }
    488       catch {
     480      } catch {
    489481        return null;
    490482      }
     
    497489    public static void TryAndRepeat(Action action, int repetitions, string errorMessage, ILog log = null) {
    498490      while (true) {
    499         try { action(); return; }
    500         catch (Exception e) {
     491        try { action(); return; } catch (Exception e) {
    501492          if (repetitions == 0) throw new HiveException(errorMessage, e);
    502493          if (log != null) log.LogMessage(string.Format("{0}: {1} - will try again!", errorMessage, e.ToString()));
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HiveServiceLocator.cs

    r14185 r14927  
    8787          WorkingEndpoint = endpointConfigurationName;
    8888          return cl;
    89         }
    90         catch (EndpointNotFoundException exc) {
     89        } catch (EndpointNotFoundException exc) {
    9190          exception = exc;
    9291          EndpointRetries++;
     
    114113      try {
    115114        return call(client);
    116       }
    117       finally {
     115      } finally {
    118116        try {
    119117          client.Close();
    120         }
    121         catch (Exception) {
     118        } catch (Exception) {
    122119          client.Abort();
    123120        }
     
    131128      try {
    132129        call(client);
    133       }
    134       finally {
     130      } finally {
    135131        try {
    136132          client.Close();
    137         }
    138         catch (Exception) {
     133        } catch (Exception) {
    139134          client.Abort();
    140135        }
     
    146141        try {
    147142          client.Close();
    148         }
    149         catch (Exception) {
     143        } catch (Exception) {
    150144          client.Abort();
    151145        }
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HiveTasks/HiveTask.cs

    r14185 r14927  
    2929using HeuristicLab.Common;
    3030using HeuristicLab.Core;
    31 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     31using HeuristicLab.Persistence;
    3232using HeuristicLab.PluginInfrastructure;
    3333
     
    3535
    3636  [Item("Hive Task", "Represents a hive task.")]
    37   [StorableClass]
     37  [StorableType("0bf8fae8-e53b-4eed-a29a-fd73d8eaad6e")]
    3838  public class HiveTask : NamedItem, IItemTree<HiveTask>, IDisposable {
    3939    protected static object locker = new object();
     
    8787          try {
    8888            childHiveTasks.Clear();
    89           }
    90           finally { childHiveTasksLock.ExitWriteLock(); }
     89          } finally { childHiveTasksLock.ExitWriteLock(); }
    9190        }
    9291        if (itemTask != value) {
     
    9695            itemTask = value;
    9796            RegisterItemTaskEvents();
    98           }
    99           finally { itemTaskLock.ExitWriteLock(); }
     97          } finally { itemTaskLock.ExitWriteLock(); }
    10098          OnItemTaskChanged();
    10199          IsFinishedTaskDownloaded = true;
     
    133131              hiveJob.IsControllable = value;
    134132            }
    135           }
    136           finally {
     133          } finally {
    137134            childHiveTasksLock.ExitReadLock();
    138135          }
     
    148145        try {
    149146          return childHiveTasks.AsReadOnly();
    150         }
    151         finally { childHiveTasksLock.ExitReadLock(); }
     147        } finally { childHiveTasksLock.ExitReadLock(); }
    152148      }
    153149    }
     
    194190      try {
    195191        this.ItemTask = PersistenceUtil.Deserialize<ItemTask>(taskData.Data);
    196       }
    197       catch {
     192      } catch {
    198193        this.ItemTask = null;
    199194      }
     
    210205      try {
    211206        this.childHiveTasks = cloner.Clone(original.childHiveTasks);
    212       }
    213       finally { original.childHiveTasksLock.ExitReadLock(); }
     207      } finally { original.childHiveTasksLock.ExitReadLock(); }
    214208      this.syncTasksWithOptimizers = original.syncTasksWithOptimizers;
    215209      this.isFinishedTaskDownloaded = original.isFinishedTaskDownloaded;
     
    260254      try {
    261255        this.childHiveTasks.Add(hiveTask);
    262       }
    263       finally { childHiveTasksLock.ExitWriteLock(); }
     256      } finally { childHiveTasksLock.ExitWriteLock(); }
    264257    }
    265258
     
    379372        }
    380373        return tasks;
    381       }
    382       finally { childHiveTasksLock.ExitReadLock(); }
     374      } finally { childHiveTasksLock.ExitReadLock(); }
    383375    }
    384376
     
    394386        }
    395387        return null;
    396       }
    397       finally { childHiveTasksLock.ExitWriteLock(); }
     388      } finally { childHiveTasksLock.ExitWriteLock(); }
    398389    }
    399390
     
    412403              return result;
    413404          }
    414         }
    415         finally { childHiveTasksLock.ExitReadLock(); }
     405        } finally { childHiveTasksLock.ExitReadLock(); }
    416406      }
    417407      return null;
     
    428418          child.RemoveByTaskId(taskId);
    429419        }
    430       }
    431       finally { childHiveTasksLock.ExitWriteLock(); }
     420      } finally { childHiveTasksLock.ExitWriteLock(); }
    432421    }
    433422
     
    482471            HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(child.task.Id));
    483472          }
    484         }
    485         finally { childHiveTasksLock.ExitReadLock(); }
     473        } finally { childHiveTasksLock.ExitReadLock(); }
    486474      } else {
    487475        HiveServiceLocator.Instance.CallHiveService(s => s.PauseTask(this.task.Id));
     
    496484            HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(child.task.Id));
    497485          }
    498         }
    499         finally { childHiveTasksLock.ExitReadLock(); }
     486        } finally { childHiveTasksLock.ExitReadLock(); }
    500487      } else {
    501488        HiveServiceLocator.Instance.CallHiveService(s => s.StopTask(this.task.Id));
     
    541528
    542529  [Item("Hive Task", "Represents a hive task.")]
    543   [StorableClass]
     530  [StorableType("ca112124-bb35-42fa-b2b7-e6367980eb8c")]
    544531  public class HiveTask<T> : HiveTask where T : ItemTask {
    545532
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/HiveTasks/OptimizerHiveTask.cs

    r14185 r14927  
    9191          }
    9292        }
    93       }
    94       finally {
     93      } finally {
    9594        childHiveTasksLock.ExitWriteLock();
    9695      }
     
    151150            }
    152151          }
    153         }
    154         finally { childHiveTasksLock.ExitWriteLock(); }
     152        } finally { childHiveTasksLock.ExitWriteLock(); }
    155153      }
    156154    }
     
    167165            }
    168166          }
    169         }
    170         finally { childHiveTasksLock.ExitWriteLock(); }
     167        } finally { childHiveTasksLock.ExitWriteLock(); }
    171168      }
    172169    }
     
    178175            this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
    179176          }
    180         }
    181         finally { childHiveTasksLock.ExitWriteLock(); }
     177        } finally { childHiveTasksLock.ExitWriteLock(); }
    182178      }
    183179    }
     
    189185            this.childHiveTasks.Remove(this.GetChildByOptimizer(item.Value));
    190186          }
    191         }
    192         finally { childHiveTasksLock.ExitWriteLock(); }
     187        } finally { childHiveTasksLock.ExitWriteLock(); }
    193188      }
    194189    }
     
    256251          }
    257252        }
    258       }
    259       finally {
     253      } finally {
    260254        itemTaskLock.ExitWriteLock();
    261255      }
     
    284278          }
    285279        }
    286       }
    287       finally {
     280      } finally {
    288281        itemTaskLock.ExitWriteLock();
    289282      }
     
    310303          child.SetIndexInParentOptimizerList(this);
    311304        }
    312       }
    313       finally { childHiveTasksLock.ExitReadLock(); }
     305      } finally { childHiveTasksLock.ExitReadLock(); }
    314306    }
    315307
     
    382374        }
    383375        return null;
    384       }
    385       finally { childHiveTasksLock.ExitReadLock(); }
     376      } finally { childHiveTasksLock.ExitReadLock(); }
    386377    }
    387378
     
    394385        }
    395386        return null;
    396       }
    397       finally { childHiveTasksLock.ExitReadLock(); }
     387      } finally { childHiveTasksLock.ExitReadLock(); }
    398388    }
    399389
     
    402392      try {
    403393        action();
    404       }
    405       finally {
     394      } finally {
    406395        itemTaskLock.ExitReadLock();
    407396      }
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/JobResultPoller.cs

    r14185 r14927  
    9696          IsPolling = false;
    9797          return;
    98         }
    99         catch (Exception e) {
     98        } catch (Exception e) {
    10099          OnExceptionOccured(e);
    101100          if (!autoResumeOnException) {
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveItemCollection.cs

    r14185 r14927  
    7070          HiveClient.Delete(item);
    7171          removed.Add(item);
    72         }
    73         catch (Exception ex) {
     72        } catch (Exception ex) {
    7473          exception = ex;
    7574          notremoved.Add(item);
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/ServiceClients/HiveServiceClient.cs

    r14738 r14927  
    422422        }
    423423    }
    424    
    425     [System.Diagnostics.DebuggerStepThroughAttribute()]
    426     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    427     [System.Runtime.Serialization.DataContractAttribute(Name="Resource", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    428     [System.SerializableAttribute()]
    429     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))]
    430     [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))]
    431     public partial class Resource : HeuristicLab.Clients.Hive.NamedHiveItem
    432     {
    433        
    434         [System.Runtime.Serialization.OptionalFieldAttribute()]
    435         private int HbIntervalField;
    436        
    437         [System.Runtime.Serialization.OptionalFieldAttribute()]
    438         private System.Nullable<System.Guid> OwnerUserIdField;
    439        
    440         [System.Runtime.Serialization.OptionalFieldAttribute()]
    441         private System.Nullable<System.Guid> ParentResourceIdField;
    442        
    443         [System.Runtime.Serialization.DataMemberAttribute()]
    444         public int HbInterval
    445         {
    446             get
    447             {
    448                 return this.HbIntervalField;
    449             }
    450             set
    451             {
    452                 if ((this.HbIntervalField.Equals(value) != true))
    453                 {
    454                     this.HbIntervalField = value;
    455                     this.RaisePropertyChanged("HbInterval");
    456                 }
    457             }
    458         }
    459        
    460         [System.Runtime.Serialization.DataMemberAttribute()]
    461         public System.Nullable<System.Guid> OwnerUserId
    462         {
    463             get
    464             {
    465                 return this.OwnerUserIdField;
    466             }
    467             set
    468             {
    469                 if ((this.OwnerUserIdField.Equals(value) != true))
    470                 {
    471                     this.OwnerUserIdField = value;
    472                     this.RaisePropertyChanged("OwnerUserId");
    473                 }
    474             }
    475         }
    476        
    477         [System.Runtime.Serialization.DataMemberAttribute()]
    478         public System.Nullable<System.Guid> ParentResourceId
    479         {
    480             get
    481             {
    482                 return this.ParentResourceIdField;
    483             }
    484             set
    485             {
    486                 if ((this.ParentResourceIdField.Equals(value) != true))
    487                 {
    488                     this.ParentResourceIdField = value;
    489                     this.RaisePropertyChanged("ParentResourceId");
    490                 }
    491             }
    492         }
    493     }
    494    
    495     [System.Diagnostics.DebuggerStepThroughAttribute()]
     424
     425  [System.Diagnostics.DebuggerStepThroughAttribute()]
     426  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     427  [System.Runtime.Serialization.DataContractAttribute(Name = "Resource", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     428  [System.SerializableAttribute()]
     429  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.Slave))]
     430  [System.Runtime.Serialization.KnownTypeAttribute(typeof(HeuristicLab.Clients.Hive.SlaveGroup))]
     431  public partial class Resource : HeuristicLab.Clients.Hive.NamedHiveItem {
     432
     433    [System.Runtime.Serialization.OptionalFieldAttribute()]
     434    private int HbIntervalField;
     435
     436    [System.Runtime.Serialization.OptionalFieldAttribute()]
     437    private System.Nullable<System.Guid> OwnerUserIdField;
     438
     439    [System.Runtime.Serialization.OptionalFieldAttribute()]
     440    private System.Nullable<System.Guid> ParentResourceIdField;
     441
     442    [System.Runtime.Serialization.DataMemberAttribute()]
     443    public int HbInterval {
     444      get {
     445        return this.HbIntervalField;
     446      }
     447      set {
     448        if ((this.HbIntervalField.Equals(value) != true)) {
     449          this.HbIntervalField = value;
     450          this.RaisePropertyChanged("HbInterval");
     451        }
     452      }
     453    }
     454
     455    [System.Runtime.Serialization.DataMemberAttribute()]
     456    public System.Nullable<System.Guid> OwnerUserId {
     457      get {
     458        return this.OwnerUserIdField;
     459      }
     460      set {
     461        if ((this.OwnerUserIdField.Equals(value) != true)) {
     462          this.OwnerUserIdField = value;
     463          this.RaisePropertyChanged("OwnerUserId");
     464        }
     465      }
     466    }
     467
     468    [System.Runtime.Serialization.DataMemberAttribute()]
     469    public System.Nullable<System.Guid> ParentResourceId {
     470      get {
     471        return this.ParentResourceIdField;
     472      }
     473      set {
     474        if ((this.ParentResourceIdField.Equals(value) != true)) {
     475          this.ParentResourceIdField = value;
     476          this.RaisePropertyChanged("ParentResourceId");
     477        }
     478      }
     479    }
     480  }
     481
     482  [System.Diagnostics.DebuggerStepThroughAttribute()]
    496483    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    497484    [System.Runtime.Serialization.DataContractAttribute(Name="Slave", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     
    740727        }
    741728    }
    742    
    743     [System.Diagnostics.DebuggerStepThroughAttribute()]
    744     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    745     [System.Runtime.Serialization.DataContractAttribute(Name="SlaveGroup", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    746     [System.SerializableAttribute()]
    747     public partial class SlaveGroup : HeuristicLab.Clients.Hive.Resource
    748     {
    749     }
    750    
    751     [System.Diagnostics.DebuggerStepThroughAttribute()]
     729
     730  [System.Diagnostics.DebuggerStepThroughAttribute()]
     731  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     732  [System.Runtime.Serialization.DataContractAttribute(Name = "SlaveGroup", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     733  [System.SerializableAttribute()]
     734  public partial class SlaveGroup : HeuristicLab.Clients.Hive.Resource {
     735  }
     736
     737  [System.Diagnostics.DebuggerStepThroughAttribute()]
    752738    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    753739    [System.Runtime.Serialization.DataContractAttribute(Name="Plugin", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     
    992978        }
    993979    }
    994    
    995     [System.Diagnostics.DebuggerStepThroughAttribute()]
    996     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    997     [System.Runtime.Serialization.DataContractAttribute(Name="ResourcePermission", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    998     [System.SerializableAttribute()]
    999     public partial class ResourcePermission : HeuristicLab.Clients.Hive.HiveItem
    1000     {
    1001        
    1002         [System.Runtime.Serialization.OptionalFieldAttribute()]
    1003         private System.Guid GrantedByUserIdField;
    1004        
    1005         [System.Runtime.Serialization.OptionalFieldAttribute()]
    1006         private System.Guid GrantedUserIdField;
    1007        
    1008         [System.Runtime.Serialization.OptionalFieldAttribute()]
    1009         private System.Guid ResourceIdField;
    1010        
    1011         [System.Runtime.Serialization.DataMemberAttribute()]
    1012         public System.Guid GrantedByUserId
    1013         {
    1014             get
    1015             {
    1016                 return this.GrantedByUserIdField;
    1017             }
    1018             set
    1019             {
    1020                 if ((this.GrantedByUserIdField.Equals(value) != true))
    1021                 {
    1022                     this.GrantedByUserIdField = value;
    1023                     this.RaisePropertyChanged("GrantedByUserId");
    1024                 }
    1025             }
    1026         }
    1027        
    1028         [System.Runtime.Serialization.DataMemberAttribute()]
    1029         public System.Guid GrantedUserId
    1030         {
    1031             get
    1032             {
    1033                 return this.GrantedUserIdField;
    1034             }
    1035             set
    1036             {
    1037                 if ((this.GrantedUserIdField.Equals(value) != true))
    1038                 {
    1039                     this.GrantedUserIdField = value;
    1040                     this.RaisePropertyChanged("GrantedUserId");
    1041                 }
    1042             }
    1043         }
    1044        
    1045         [System.Runtime.Serialization.DataMemberAttribute()]
    1046         public System.Guid ResourceId
    1047         {
    1048             get
    1049             {
    1050                 return this.ResourceIdField;
    1051             }
    1052             set
    1053             {
    1054                 if ((this.ResourceIdField.Equals(value) != true))
    1055                 {
    1056                     this.ResourceIdField = value;
    1057                     this.RaisePropertyChanged("ResourceId");
    1058                 }
    1059             }
    1060         }
    1061     }
    1062    
    1063     [System.Diagnostics.DebuggerStepThroughAttribute()]
     980
     981  [System.Diagnostics.DebuggerStepThroughAttribute()]
     982  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     983  [System.Runtime.Serialization.DataContractAttribute(Name = "ResourcePermission", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     984  [System.SerializableAttribute()]
     985  public partial class ResourcePermission : HeuristicLab.Clients.Hive.HiveItem {
     986
     987    [System.Runtime.Serialization.OptionalFieldAttribute()]
     988    private System.Guid GrantedByUserIdField;
     989
     990    [System.Runtime.Serialization.OptionalFieldAttribute()]
     991    private System.Guid GrantedUserIdField;
     992
     993    [System.Runtime.Serialization.OptionalFieldAttribute()]
     994    private System.Guid ResourceIdField;
     995
     996    [System.Runtime.Serialization.DataMemberAttribute()]
     997    public System.Guid GrantedByUserId {
     998      get {
     999        return this.GrantedByUserIdField;
     1000      }
     1001      set {
     1002        if ((this.GrantedByUserIdField.Equals(value) != true)) {
     1003          this.GrantedByUserIdField = value;
     1004          this.RaisePropertyChanged("GrantedByUserId");
     1005        }
     1006      }
     1007    }
     1008
     1009    [System.Runtime.Serialization.DataMemberAttribute()]
     1010    public System.Guid GrantedUserId {
     1011      get {
     1012        return this.GrantedUserIdField;
     1013      }
     1014      set {
     1015        if ((this.GrantedUserIdField.Equals(value) != true)) {
     1016          this.GrantedUserIdField = value;
     1017          this.RaisePropertyChanged("GrantedUserId");
     1018        }
     1019      }
     1020    }
     1021
     1022    [System.Runtime.Serialization.DataMemberAttribute()]
     1023    public System.Guid ResourceId {
     1024      get {
     1025        return this.ResourceIdField;
     1026      }
     1027      set {
     1028        if ((this.ResourceIdField.Equals(value) != true)) {
     1029          this.ResourceIdField = value;
     1030          this.RaisePropertyChanged("ResourceId");
     1031        }
     1032      }
     1033    }
     1034  }
     1035
     1036  [System.Diagnostics.DebuggerStepThroughAttribute()]
    10641037    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    10651038    [System.Runtime.Serialization.DataContractAttribute(Name="Downtime", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     
    15531526        }
    15541527    }
    1555    
    1556     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1557     [System.Runtime.Serialization.DataContractAttribute(Name="Command", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    1558     public enum Command : int
    1559     {
    1560        
    1561         [System.Runtime.Serialization.EnumMemberAttribute()]
    1562         Stop = 0,
    1563        
    1564         [System.Runtime.Serialization.EnumMemberAttribute()]
    1565         Abort = 1,
    1566        
    1567         [System.Runtime.Serialization.EnumMemberAttribute()]
    1568         Pause = 2,
    1569     }
    1570    
    1571     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1528
     1529  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1530  [System.Runtime.Serialization.DataContractAttribute(Name = "Command", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1531  public enum Command : int {
     1532
     1533    [System.Runtime.Serialization.EnumMemberAttribute()]
     1534    Stop = 0,
     1535
     1536    [System.Runtime.Serialization.EnumMemberAttribute()]
     1537    Abort = 1,
     1538
     1539    [System.Runtime.Serialization.EnumMemberAttribute()]
     1540    Pause = 2,
     1541  }
     1542
     1543  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    15721544    [System.Runtime.Serialization.DataContractAttribute(Name="TaskState", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    15731545    public enum TaskState : int
     
    15981570        Failed = 7,
    15991571    }
    1600    
    1601     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1602     [System.Runtime.Serialization.DataContractAttribute(Name="Permission", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    1603     public enum Permission : int
    1604     {
    1605        
    1606         [System.Runtime.Serialization.EnumMemberAttribute()]
    1607         NotAllowed = 0,
    1608        
    1609         [System.Runtime.Serialization.EnumMemberAttribute()]
    1610         Read = 1,
    1611        
    1612         [System.Runtime.Serialization.EnumMemberAttribute()]
    1613         Full = 2,
    1614     }
    1615    
    1616     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1572
     1573  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1574  [System.Runtime.Serialization.DataContractAttribute(Name = "Permission", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1575  public enum Permission : int {
     1576
     1577    [System.Runtime.Serialization.EnumMemberAttribute()]
     1578    NotAllowed = 0,
     1579
     1580    [System.Runtime.Serialization.EnumMemberAttribute()]
     1581    Read = 1,
     1582
     1583    [System.Runtime.Serialization.EnumMemberAttribute()]
     1584    Full = 2,
     1585  }
     1586
     1587  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    16171588    [System.Runtime.Serialization.DataContractAttribute(Name="CpuArchitecture", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    16181589    public enum CpuArchitecture : int
     
    16251596        x64 = 1,
    16261597    }
    1627    
    1628     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1629     [System.Runtime.Serialization.DataContractAttribute(Name="SlaveState", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
    1630     public enum SlaveState : int
    1631     {
    1632        
    1633         [System.Runtime.Serialization.EnumMemberAttribute()]
    1634         Idle = 0,
    1635        
    1636         [System.Runtime.Serialization.EnumMemberAttribute()]
    1637         Calculating = 1,
    1638        
    1639         [System.Runtime.Serialization.EnumMemberAttribute()]
    1640         Offline = 2,
    1641     }
    1642    
    1643     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1598
     1599  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     1600  [System.Runtime.Serialization.DataContractAttribute(Name = "SlaveState", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataTransfer")]
     1601  public enum SlaveState : int {
     1602
     1603    [System.Runtime.Serialization.EnumMemberAttribute()]
     1604    Idle = 0,
     1605
     1606    [System.Runtime.Serialization.EnumMemberAttribute()]
     1607    Calculating = 1,
     1608
     1609    [System.Runtime.Serialization.EnumMemberAttribute()]
     1610    Offline = 2,
     1611  }
     1612
     1613  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    16441614    [System.Runtime.Serialization.DataContractAttribute(Name="DowntimeType", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive.DataAccess")]
    16451615    public enum DowntimeType : int
     
    19931963            }
    19941964        }
    1995        
    1996         [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    1997         [System.Runtime.Serialization.DataContractAttribute(Name="MessageContainer.MessageType", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive")]
    1998         public enum MessageType : int
    1999         {
    2000            
    2001             [System.Runtime.Serialization.EnumMemberAttribute()]
    2002             CalculateTask = 0,
    2003            
    2004             [System.Runtime.Serialization.EnumMemberAttribute()]
    2005             StopTask = 1,
    2006            
    2007             [System.Runtime.Serialization.EnumMemberAttribute()]
    2008             StopAll = 2,
    2009            
    2010             [System.Runtime.Serialization.EnumMemberAttribute()]
    2011             AbortTask = 3,
    2012            
    2013             [System.Runtime.Serialization.EnumMemberAttribute()]
    2014             AbortAll = 4,
    2015            
    2016             [System.Runtime.Serialization.EnumMemberAttribute()]
    2017             PauseTask = 5,
    2018            
    2019             [System.Runtime.Serialization.EnumMemberAttribute()]
    2020             PauseAll = 6,
    2021            
    2022             [System.Runtime.Serialization.EnumMemberAttribute()]
    2023             Restart = 7,
    2024            
    2025             [System.Runtime.Serialization.EnumMemberAttribute()]
    2026             Sleep = 8,
    2027            
    2028             [System.Runtime.Serialization.EnumMemberAttribute()]
    2029             ShutdownSlave = 9,
    2030            
    2031             [System.Runtime.Serialization.EnumMemberAttribute()]
    2032             SayHello = 10,
    2033            
    2034             [System.Runtime.Serialization.EnumMemberAttribute()]
    2035             NewHBInterval = 11,
    2036            
    2037             [System.Runtime.Serialization.EnumMemberAttribute()]
    2038             ShutdownComputer = 12,
    2039         }
    2040     }
    2041    
    2042     [System.Diagnostics.DebuggerStepThroughAttribute()]
     1965
    20431966    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
    2044     [System.Runtime.Serialization.DataContractAttribute(Name="PluginAlreadyExistsFault", Namespace="http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive")]
    2045     [System.SerializableAttribute()]
    2046     public partial class PluginAlreadyExistsFault : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged
    2047     {
    2048        
    2049         [System.NonSerializedAttribute()]
    2050         private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
    2051        
    2052         [System.Runtime.Serialization.OptionalFieldAttribute()]
    2053         private System.Guid IdField;
    2054        
    2055         public System.Runtime.Serialization.ExtensionDataObject ExtensionData
    2056         {
    2057             get
    2058             {
    2059                 return this.extensionDataField;
    2060             }
    2061             set
    2062             {
    2063                 this.extensionDataField = value;
    2064             }
    2065         }
    2066        
    2067         [System.Runtime.Serialization.DataMemberAttribute()]
    2068         public System.Guid Id
    2069         {
    2070             get
    2071             {
    2072                 return this.IdField;
    2073             }
    2074             set
    2075             {
    2076                 if ((this.IdField.Equals(value) != true))
    2077                 {
    2078                     this.IdField = value;
    2079                     this.RaisePropertyChanged("Id");
    2080                 }
    2081             }
    2082         }
    2083        
    2084         public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
    2085        
    2086         protected void RaisePropertyChanged(string propertyName)
    2087         {
    2088             System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
    2089             if ((propertyChanged != null))
    2090             {
    2091                 propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
    2092             }
    2093         }
    2094     }
    2095    
    2096     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     1967    [System.Runtime.Serialization.DataContractAttribute(Name = "MessageContainer.MessageType", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive")]
     1968    public enum MessageType : int {
     1969
     1970      [System.Runtime.Serialization.EnumMemberAttribute()]
     1971      CalculateTask = 0,
     1972
     1973      [System.Runtime.Serialization.EnumMemberAttribute()]
     1974      StopTask = 1,
     1975
     1976      [System.Runtime.Serialization.EnumMemberAttribute()]
     1977      StopAll = 2,
     1978
     1979      [System.Runtime.Serialization.EnumMemberAttribute()]
     1980      AbortTask = 3,
     1981
     1982      [System.Runtime.Serialization.EnumMemberAttribute()]
     1983      AbortAll = 4,
     1984
     1985      [System.Runtime.Serialization.EnumMemberAttribute()]
     1986      PauseTask = 5,
     1987
     1988      [System.Runtime.Serialization.EnumMemberAttribute()]
     1989      PauseAll = 6,
     1990
     1991      [System.Runtime.Serialization.EnumMemberAttribute()]
     1992      Restart = 7,
     1993
     1994      [System.Runtime.Serialization.EnumMemberAttribute()]
     1995      Sleep = 8,
     1996
     1997      [System.Runtime.Serialization.EnumMemberAttribute()]
     1998      ShutdownSlave = 9,
     1999
     2000      [System.Runtime.Serialization.EnumMemberAttribute()]
     2001      SayHello = 10,
     2002
     2003      [System.Runtime.Serialization.EnumMemberAttribute()]
     2004      NewHBInterval = 11,
     2005
     2006      [System.Runtime.Serialization.EnumMemberAttribute()]
     2007      ShutdownComputer = 12,
     2008    }
     2009  }
     2010
     2011  [System.Diagnostics.DebuggerStepThroughAttribute()]
     2012  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.Runtime.Serialization", "4.0.0.0")]
     2013  [System.Runtime.Serialization.DataContractAttribute(Name = "PluginAlreadyExistsFault", Namespace = "http://schemas.datacontract.org/2004/07/HeuristicLab.Services.Hive")]
     2014  [System.SerializableAttribute()]
     2015  public partial class PluginAlreadyExistsFault : object, System.Runtime.Serialization.IExtensibleDataObject, System.ComponentModel.INotifyPropertyChanged {
     2016
     2017    [System.NonSerializedAttribute()]
     2018    private System.Runtime.Serialization.ExtensionDataObject extensionDataField;
     2019
     2020    [System.Runtime.Serialization.OptionalFieldAttribute()]
     2021    private System.Guid IdField;
     2022
     2023    public System.Runtime.Serialization.ExtensionDataObject ExtensionData {
     2024      get {
     2025        return this.extensionDataField;
     2026      }
     2027      set {
     2028        this.extensionDataField = value;
     2029      }
     2030    }
     2031
     2032    [System.Runtime.Serialization.DataMemberAttribute()]
     2033    public System.Guid Id {
     2034      get {
     2035        return this.IdField;
     2036      }
     2037      set {
     2038        if ((this.IdField.Equals(value) != true)) {
     2039          this.IdField = value;
     2040          this.RaisePropertyChanged("Id");
     2041        }
     2042      }
     2043    }
     2044
     2045    public event System.ComponentModel.PropertyChangedEventHandler PropertyChanged;
     2046
     2047    protected void RaisePropertyChanged(string propertyName) {
     2048      System.ComponentModel.PropertyChangedEventHandler propertyChanged = this.PropertyChanged;
     2049      if ((propertyChanged != null)) {
     2050        propertyChanged(this, new System.ComponentModel.PropertyChangedEventArgs(propertyName));
     2051      }
     2052    }
     2053  }
     2054
     2055  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    20972056    [System.ServiceModel.ServiceContractAttribute(ConfigurationName="HeuristicLab.Clients.Hive.IHiveService")]
    20982057    public interface IHiveService
     
    22562215        System.Collections.Generic.List<HeuristicLab.Clients.Hive.UserPriority> GetUserPriorities();
    22572216    }
    2258    
    2259     [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    2260     public interface IHiveServiceChannel : HeuristicLab.Clients.Hive.IHiveService, System.ServiceModel.IClientChannel
    2261     {
    2262     }
    2263    
    2264     [System.Diagnostics.DebuggerStepThroughAttribute()]
     2217
     2218  [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
     2219  public interface IHiveServiceChannel : HeuristicLab.Clients.Hive.IHiveService, System.ServiceModel.IClientChannel {
     2220  }
     2221
     2222  [System.Diagnostics.DebuggerStepThroughAttribute()]
    22652223    [System.CodeDom.Compiler.GeneratedCodeAttribute("System.ServiceModel", "4.0.0.0")]
    22662224    public partial class HiveServiceClient : System.ServiceModel.ClientBase<HeuristicLab.Clients.Hive.IHiveService>, HeuristicLab.Clients.Hive.IHiveService
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/StateLogList.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Clients.Hive {
    28   [StorableClass]
     28  [StorableType("c191d8c7-8edb-4d0c-82f1-6e24c18f4ea4")]
    2929  public class StateLogList : ItemList<StateLog> {
    3030
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/StateLogListList.cs

    r14185 r14927  
    2323using HeuristicLab.Common;
    2424using HeuristicLab.Core;
    25 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     25using HeuristicLab.Persistence;
    2626
    2727namespace HeuristicLab.Clients.Hive {
    28   [StorableClass]
     28  [StorableType("286bdb7e-a1bd-42d9-93c7-4848e92eb869")]
    2929  public class StateLogListList : ItemList<StateLogList> {
    3030
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/TaskDownloader.cs

    r14185 r14927  
    4040          resultsLock.EnterReadLock();
    4141          return results.Count == taskIds.Count();
    42         }
    43         finally { resultsLock.ExitReadLock(); }
     42        } finally { resultsLock.ExitReadLock(); }
    4443      }
    4544    }
     
    6261          resultsLock.EnterReadLock();
    6362          return results.Count;
    64         }
    65         finally { resultsLock.ExitReadLock(); }
     63        } finally { resultsLock.ExitReadLock(); }
    6664      }
    6765    }
     
    7270          resultsLock.EnterReadLock();
    7371          return results;
    74         }
    75         finally { resultsLock.ExitReadLock(); }
     72        } finally { resultsLock.ExitReadLock(); }
    7673      }
    7774    }
     
    9491                resultsLock.EnterWriteLock();
    9592                results.Add(localTask.Id, hiveTask);
    96               }
    97               finally { resultsLock.ExitWriteLock(); }
     93              } finally { resultsLock.ExitWriteLock(); }
    9894            }
    9995          });
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Tasks/EngineTask.cs

    r14185 r14927  
    2424using HeuristicLab.Common;
    2525using HeuristicLab.Core;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Clients.Hive {
    29   [StorableClass]
     29  [StorableType("46eb95f3-99a6-40ca-a50a-4df387a96d55")]
    3030  public class EngineTask : ItemTask {
    3131    public override HiveTask CreateHiveTask() {
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Tasks/ItemTask.cs

    r14185 r14927  
    2626using HeuristicLab.Core;
    2727using HeuristicLab.Hive;
    28 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     28using HeuristicLab.Persistence;
    2929using HeuristicLab.PluginInfrastructure;
    3030
    3131namespace HeuristicLab.Clients.Hive {
    3232  [Item("Item Task", "Represents a executable hive task which contains a HeuristicLab Item.")]
    33   [StorableClass]
     33  [StorableType("a0fe82f7-d030-48a1-9083-9b8cb9a6682f")]
    3434  public abstract class ItemTask : NamedItem, ITask {
    3535    public virtual HiveTask CreateHiveTask() {
  • branches/PersistenceReintegration/HeuristicLab.Clients.Hive/3.3/Tasks/OptimizerTask.cs

    r14185 r14927  
    2424using HeuristicLab.Core;
    2525using HeuristicLab.Optimization;
    26 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
     26using HeuristicLab.Persistence;
    2727
    2828namespace HeuristicLab.Clients.Hive.Jobs {
    2929  [Item("Optimizer Task", "Represents Task which executes a IOptimizer object.")]
    30   [StorableClass]
     30  [StorableType("4d8607bf-1e84-4c90-872d-1ce743f9e4d8")]
    3131  public class OptimizerTask : ItemTask {
    3232    public override HiveTask CreateHiveTask() {
Note: See TracChangeset for help on using the changeset viewer.