Changeset 2130

Timestamp:

Mar 30, 2006, 11:44:07 AM (17 years ago)

Author:

Nicklas Nordborg

Message:

New bioassays now get the same name as their parent bioassay or raw bioassay

File:

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

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

@@ -495 +495 @@
     Set<RawBioAssayData> rawBioAssays = ba.getData().getRawParents();
     Set<RawBioAssayData> transformationRawSources = getData().getTransformation().getRawSources();
+    String baName = null;
     for (RawBioAssay rba : rawParents)
     {
@@ -502 +503 @@
       }
       rawBioAssays.add(rba.getData());
-    }
+      baName = rba.getName();
+    }
+    if (rawParents.size() == 1) ba.setName(baName);
     return ba;
   }
@@ -554 +557 @@
     
     // Everyting is ok, create the new bioassay
-    return newBioAssay(parent.getDataCubeColumn(), Collections.singleton(parent));
+    BioAssay ba = newBioAssay(parent.getDataCubeColumn(), Collections.singleton(parent));
+    ba.setName(parent.getName());
+    return ba;
   }