Changeset 5119

Timestamp:

Oct 8, 2009, 10:46:51 AM (14 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1401: One-to-one associations should not be synchronized in the data layer classes

Location:

trunk/src/core/net/sf/basedb/core

Files:

• Hybridization.java (modified) (2 diffs)
• MeasuredBioMaterial.java (modified) (1 diff)
• data/ArraySlideData.java (modified) (1 diff)
• data/BioWellData.java (modified) (1 diff)
• data/HybridizationData.java (modified) (1 diff)
• data/MeasuredBioMaterialData.java (modified) (1 diff)

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

@@ -23 +23 @@
 package net.sf.basedb.core;
 
+import net.sf.basedb.core.data.ArraySlideData;
 import net.sf.basedb.core.data.HybridizationData;
 import net.sf.basedb.core.query.Expressions;
@@ -291 +292 @@
   {
     checkPermission(Permission.WRITE);
-    if(arraySlide != null) arraySlide.checkPermission(Permission.USE);
-    getData().setArraySlide(arraySlide == null ? null : arraySlide.getData());
+    ArraySlideData data = null;
+    if(arraySlide != null) 
+    {
+      arraySlide.checkPermission(Permission.USE);
+      data = arraySlide.getData();
+      data.setHybridization(getData());
+    }
+    getData().setArraySlide(data);
   }
   

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

@@ -357 +357 @@
       well.checkPermission(Permission.USE);
       bw = well.getData();
-    } 
+      bw.setBioMaterial(getData());
+    }
     getData().setBioWell(bw);
   }

trunk/src/core/net/sf/basedb/core/data/ArraySlideData.java

@@ -132 +132 @@
   }
 
-  void setHybridization(HybridizationData hybridization)
+  public void setHybridization(HybridizationData hybridization)
   {
     this.hybridization = hybridization;

trunk/src/core/net/sf/basedb/core/data/BioWellData.java

@@ -89 +89 @@
     return bioMaterial;
   }
-  void setBioMaterial(MeasuredBioMaterialData bioMaterial)
+  public void setBioMaterial(MeasuredBioMaterialData bioMaterial)
   {
     this.bioMaterial = bioMaterial;

trunk/src/core/net/sf/basedb/core/data/HybridizationData.java

@@ -55 +55 @@
   public void setArraySlide(ArraySlideData arraySlide)
   {
-    if (arraySlide != null) arraySlide.setHybridization(this);
     this.arraySlide = arraySlide;
   }

trunk/src/core/net/sf/basedb/core/data/MeasuredBioMaterialData.java

@@ -163 +163 @@
   public void setBioWell(BioWellData bioWell)
   {
-    if (bioWell != null) bioWell.setBioMaterial(this);
     this.bioWell = bioWell;
   }