Changeset 6989

Timestamp:

Nov 2, 2015, 8:46:40 AM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #1958: Add Kit item

Added KitData item in the data layer and links to it from the BioMaterialEventData and BioPlateEventData classes.

Increasing the database schema version.

Location:

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

Files:

• Install.java (modified) (1 diff)
• Update.java (modified) (3 diffs)
• data/BioMaterialEventData.java (modified) (1 diff)
• data/BioPlateEventData.java (modified) (1 diff)
• data/KitData.java (added)

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

@@ -118 +118 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(127).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(128).intValue();
   
   public static synchronized int createTables(SchemaGenerator.Mode mode, ProgressReporter progress,

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

@@ -53 +53 @@
 import net.sf.basedb.core.data.ItemSubtypeData;
 import net.sf.basedb.core.data.JobData;
+import net.sf.basedb.core.data.KitData;
 import net.sf.basedb.core.data.MeasuredBioMaterialData;
 import net.sf.basedb.core.data.ParameterValueData;
@@ -285 +286 @@
     </td>
   </tr>
+  <tr>
+    <td>128</td>
+    <td>
+      Added {@link KitData} and other things related to it.
+    </td>
+  </tr>
   </table>
 
@@ -462 +469 @@
       }
       
-      if (schemaVersion < 127)
-      {
-        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 127...");
-        // Schemaversion 127 only updates the version number
-        schemaVersion = setSchemaVersionInTransaction(session, 127);
-        progress_current += progress_step;
+      if (schemaVersion < 128)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 128...");
+        // Schemaversion 127-128 only updates the version number
+        schemaVersion = setSchemaVersionInTransaction(session, 128);
+        progress_current += 2 * progress_step;
       }
     

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

@@ -178 +178 @@
   }
   
+  private KitData kit;
+  /**
+    Get the kit used in this event.
+    @since 3.7
+    @hibernate.many-to-one column="`kit_id`" not-null="false" outer-join="false"
+  */
+  public KitData getKit()
+  {
+    return kit;
+  }
+  public void setKit(KitData kit)
+  {
+    this.kit = kit;
+  }
+
   private Date eventDate;
   /**

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

@@ -121 +121 @@
   }
   
+  private KitData kit;
+  /**
+    Get the kit used in this event.
+    @since 3.7
+    @hibernate.many-to-one column="`kit_id`" not-null="false" outer-join="false"
+  */
+  public KitData getKit()
+  {
+    return kit;
+  }
+  public void setKit(KitData kit)
+  {
+    this.kit = kit;
+  }
+
   private Set<BioPlateEventParticipantData> participants;
   /**