Changeset 4623

Timestamp:

Nov 3, 2008, 9:32:00 AM (15 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1163: Set name of child bioassay when there is only one parent

File:

• trunk/src/core/net/sf/basedb/core/BioAssaySet.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/BioAssaySet.java

@@ -749 +749 @@
     
     // Everything is ok, create the new bioassay
-    BioAssay ba = newBioAssay(parent.getDataCubeColumn(), Collections.singleton(parent));
-    ba.setName(parent.getName());
-    return ba;
+    return newBioAssay(parent.getDataCubeColumn(), Collections.singleton(parent));
   }
   
@@ -814 +812 @@
   /**
     Create a new bioassay and link to the parents. Assume that all
-    neccessary checks has been made by calling code.
+    neccessary checks has been made by calling code. If the collections contains
+    only a single parent, the name will be copied to the child.
   */
   private BioAssay newBioAssay(DataCubeColumn column, Collection<BioAssay> parents)
   {
     BioAssay ba = BioAssay.getNew(getDbControl(), this, column);
+    int numParents = parents.size();
     
     // Add parents and raw parents to the new BioAssay
@@ -825 +825 @@
     for (BioAssay parent : parents)
     {
+      if (numParents == 1) ba.setName(parent.getName());
       baParents.add(parent.getData());
       rawParents.addAll(parent.getData().getRawParents());