Changeset 1758 for trunk

Timestamp:

05/08/09 12:42:03 (15 years ago)

Author:

svonolfe

Message:

Small refactoring of the manyToManyRelationHelper (#527)

Location:

trunk/sources

Files:

• HeuristicLab.DataAccess.ADOHelper/3.2/ManyToManyRelationHelper.cs (modified) (5 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientGroupAdapter.cs (modified) (2 diffs)
• HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs (modified) (2 diffs)
• HeuristicLab.Security.ADODataAccess/3.2/UserGroupAdapter.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.DataAccess.ADOHelper/3.2/ManyToManyRelationHelper.cs

@@ -10 +10 @@
     {
     ITableAdapterWrapper<AdapterT, ManyToManyRelation, RowT> tableAdapterWrapper;
-    
+
+    private int childIndex;
+
     public ManyToManyRelationHelper(
-      ITableAdapterWrapper<AdapterT, ManyToManyRelation, RowT> tableAdapterWrapper) {
+      ITableAdapterWrapper<AdapterT, ManyToManyRelation, RowT> tableAdapterWrapper, 
+      int childIndex) {
       this.tableAdapterWrapper = tableAdapterWrapper;
+      this.childIndex = childIndex;
     }
 
@@ -24 +28 @@
     public void UpdateRelationships(Guid objectA,
       IList<Guid> relationships, int childIndex) {
-      UpdateRelationships(objectA, relationships, null, childIndex);
+      UpdateRelationships(objectA, relationships, null);
     }
 
     public void UpdateRelationships(Guid objectA, 
       IList<Guid> relationships,
-      IList<object> additionalAttributes, int childIndex) {
+      IList<object> additionalAttributes) {
       //firstly check for created references
       IList<Guid> existing =
-        this.GetRelationships(objectA, childIndex); 
+        this.GetRelationships(objectA); 
 
       foreach (Guid relationship in relationships) {
@@ -63 +67 @@
       foreach (Guid relationship in deleted) {
         RowT toDelete =
-          FindRow(objectA, relationship, childIndex);
+          FindRow(objectA, relationship);
         if (toDelete != null) {
           toDelete.Delete();
@@ -71 +75 @@
     }
 
-    public IList<Guid> GetRelationships(Guid objectA, int childIndex) {
+    public IList<Guid> GetRelationships(Guid objectA) {
       IList<Guid> result =
         new List<Guid>();
@@ -85 +89 @@
     }
 
-    private RowT FindRow(Guid objectA, Guid objectB, int childIndex) {
+    private RowT FindRow(Guid objectA, Guid objectB) {
       IEnumerable<RowT> rows =
        tableAdapterWrapper.FindById(objectA);

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/ClientGroupAdapter.cs

@@ -51 +51 @@
           manyToManyRelationHelper =
             new ManyToManyRelationHelper<dsHiveServerTableAdapters.ClientGroup_ResourceTableAdapter,
-              dsHiveServer.ClientGroup_ResourceRow>(new ClientGroup_ResourceAdapterWrapper());
+              dsHiveServer.ClientGroup_ResourceRow>(new ClientGroup_ResourceAdapterWrapper(), 1);
         }
 
@@ -86 +86 @@
 
         ICollection<Guid> resources =
-          ManyToManyRelationHelper.GetRelationships(clientGroup.Id, 1);
+          ManyToManyRelationHelper.GetRelationships(clientGroup.Id);
 
         clientGroup.Resources.Clear();

trunk/sources/HeuristicLab.Hive.Server.ADODataAccess/3.2/JobAdapter.cs

@@ -51 +51 @@
           manyToManyRelationHelper =
             new ManyToManyRelationHelper<dsHiveServerTableAdapters.RequiredPluginsTableAdapter,
-              dsHiveServer.RequiredPluginsRow>(new RequiredPluginsAdapterWrapper());
+              dsHiveServer.RequiredPluginsRow>(new RequiredPluginsAdapterWrapper(), 1);
         }
 
@@ -164 +164 @@
 
         ICollection<Guid> requiredPlugins =
-          ManyToManyRelationHelper.GetRelationships(job.Id, 1);
+          ManyToManyRelationHelper.GetRelationships(job.Id);
         
         job.PluginsNeeded.Clear();

trunk/sources/HeuristicLab.Security.ADODataAccess/3.2/UserGroupAdapter.cs

@@ -28 +28 @@
           manyToManyRelationHelper =
             new ManyToManyRelationHelper<dsSecurityTableAdapters.PermissionOwner_UserGroupTableAdapter,
-              dsSecurity.PermissionOwner_UserGroupRow>(new PermissionOwner_UserGroupAdapterWrapper());
+              dsSecurity.PermissionOwner_UserGroupRow>(new PermissionOwner_UserGroupAdapterWrapper(), 0);
         }
 
@@ -67 +67 @@
 
         ICollection<Guid> permissionOwners =
-          ManyToManyRelationHelper.GetRelationships(group.Id, 0);
+          ManyToManyRelationHelper.GetRelationships(group.Id);
 
         group.Members.Clear();