Changeset 5056

Timestamp:

Aug 18, 2009, 2:09:01 PM (13 years ago)

Author:

Nicklas Nordborg

Message:

References #108: Logging the change history of an item

• Annotation logger can now handle updates as well, due to a new 'last update' field in the annotation table.

Location:

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

Files:

• Annotation.java (modified) (3 diffs)
• AnnotationSet.java (modified) (2 diffs)
• Install.java (modified) (1 diff)
• Update.java (modified) (3 diffs)
• data/AnnotationData.java (modified) (2 diffs)
• data/ParameterValueData.java (modified) (3 diffs)

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

@@ -32 +32 @@
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Collections;
@@ -437 +438 @@
     }
     getData().getValues().setSingleValue(Values.getDataValue(value));
+    getData().setLastUpdate(new Date());
   }
 
@@ -495 +497 @@
     }
     getData().getValues().replaceValues(Values.getDataValues(convertedValues));
+    getData().setLastUpdate(new Date());
   }
 

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

@@ -24 +24 @@
 
 import java.util.Collections;
+import java.util.Date;
 import java.util.LinkedList;
 import java.util.List;
@@ -744 +745 @@
         AnnotationData from = entry.getValue();
         to.getValues().replaceValues(from.getValues().getValues());
+        to.setLastUpdate(new Date());
       }
     }

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

@@ -114 +114 @@
     method.
   */
-  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(73).intValue();
+  public static final int NEW_SCHEMA_VERSION = Integer.valueOf(74).intValue();
   
   public static synchronized void createTables(boolean update, final ProgressReporter progress)

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

@@ -35 +35 @@
 import org.hibernate.mapping.Table;
 
+import net.sf.basedb.core.data.AnnotationData;
 import net.sf.basedb.core.data.ArrayDesignData;
 import net.sf.basedb.core.data.ChangeHistoryData;
@@ -823 +824 @@
     </td>
   </tr>
+  <tr>
+    <td>74</td>
+    <td>
+      Added {@link AnnotationData#getLastUpdate()}.
+      No special update is needed. Only increase the schema version.
+    </td>
+  </tr>
   </table>
 
@@ -1105 +1113 @@
       }
       
-      // Schemaversion 61-73 only updates the version number
-      if (schemaVersion < 73)
-      {
-        if (progress != null) progress.display((int)(72*progress_factor), "--Updating schema version: " + schemaVersion + " -> 73...");
-        schemaVersion = setSchemaVersionInTransaction(session, 73);
+      // Schemaversion 61-74 only updates the version number
+      if (schemaVersion < 74)
+      {
+        if (progress != null) progress.display((int)(73*progress_factor), "--Updating schema version: " + schemaVersion + " -> 74...");
+        schemaVersion = setSchemaVersionInTransaction(session, 74);
       }
       

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

@@ -23 +23 @@
 package net.sf.basedb.core.data;
 
+import java.util.Date;
 import java.util.Set;
 
@@ -106 +107 @@
   }
   
+  private Date lastUpdate;
+  /**
+    Get the date and time the values in this annotation was last updated.
+    @return A <code>Date</code> object, or null if not known
+    @hibernate.property column="`last_update`" type="timestamp" not-null="false"
+  */
+  public Date getLastUpdate()
+  {
+    return lastUpdate;
+  }
+  public void setLastUpdate(Date lastUpdate)
+  {
+    this.lastUpdate = lastUpdate;
+  }
+  
   private Set<AnnotationSetData> inheritingSets;
   /**

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

@@ -95 +95 @@
   /**
     Set values of this parameter.
+    <p>
+    NOTE! Used by Hibernate to initialize the object. Do not 
+    call {@link AnnotationData#setLastUpdate(java.util.Date)}!
     @param values Collection of values.
   */
@@ -103 +106 @@
     values in the specified list. It is expected that
     the list contains only objects of the correct type.
+    <p>
+    NOTE! When this method is called to set annotation values
+    for an {@link AnnotationData}, don't forget to also update
+    the last update timestamp: {@link AnnotationData#setLastUpdate(java.util.Date)}.
   */
   @SuppressWarnings("unchecked")
@@ -115 +122 @@
     Replace the current list with a single new value.
     It is expected that the value is of the correct type.
+    <p>
+    NOTE! When this method is called to set annotation values
+    for an {@link AnnotationData}, don't forget to also update
+    the last update timestamp: {@link AnnotationData#setLastUpdate(java.util.Date)}.
   */
   @SuppressWarnings("unchecked")