Changeset 7198

Timestamp:

Oct 17, 2016, 9:01:25 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

References #2029: Projects should be annotatable

Fixed in the data and core layer. Updates the schema version to 134.

Location:

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

Files:

• Install.java (modified) (1 diff)
• Project.java (modified) (3 diffs)
• Update.java (modified) (2 diffs)
• data/ProjectData.java (modified) (3 diffs)

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

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

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

@@ -25 +25 @@
 
 import net.sf.basedb.core.Transactional.Action;
+import net.sf.basedb.core.data.AnnotationSetData;
 import net.sf.basedb.core.data.BasicData;
 import net.sf.basedb.core.data.ItemParameterValueData;
@@ -89 +90 @@
 public class Project
   extends OwnedItem
-  implements Nameable, Removable, Registered
+  implements Nameable, Removable, Registered, Annotatable
 {
   /**
@@ -237 +238 @@
   {
     return DateUtil.copy(getData().getEntryDate());
+  }
+  // -------------------------------------------
+
+  /*
+    From the Annotatable interface
+    -------------------------------------------
+  */
+  @Override
+  public AnnotationSet getAnnotationSet()
+    throws PermissionDeniedException, BaseException
+  {
+    checkBatchAnnotatableUsage(true, false);
+    DbControl dc = getDbControl();
+    AnnotationSet as = dc.getItem(AnnotationSet.class, getData().getAnnotationSet(), this);
+    if (as == null)
+    {
+      as = AnnotationSet.getNew(dc, this);
+      getData().setAnnotationSet(as.getData());
+      dc.saveItemIf(this, as, false);
+    }
+    return as;
+  }
+  @Override
+  public boolean isAnnotated()
+  {
+    return getData().getAnnotationSet() != null;
+  }
+  @Override
+  public void removeAnnotations()
+    throws PermissionDeniedException, BaseException
+  {
+    checkPermission(Permission.WRITE);
+    AnnotationSetData as = getData().getAnnotationSet();
+    if (as != null)
+    {
+      HibernateUtil.deleteData(getDbControl().getHibernateSession(), as);
+      getData().setAnnotationSet(null);
+    }
+  }
+  /**
+    Default implementation returns null. Should be overriden by subclasses
+    that has protocols.
+    @return Always null
+  */
+  @Override
+  public Protocol getProtocol()
+  {
+    return null;
+  }
+  
+  /**
+    @return Always null
+   */
+  public Set<Annotatable> getAnnotatableParents()
+    throws BaseException
+  {
+    return null;
   }
   // -------------------------------------------

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

@@ -331 +331 @@
     </td>
   </tr>
+  <tr>
+    <td>134</td>
+    <td>
+      Made {@link Project} annotatable. No special database update is needed. 
+      Only increase the schema version.
+    </td>
+  </tr>
     
   </table>
@@ -537 +544 @@
         progress_current += progress_step;
       }
-    
+      
+      if (schemaVersion < 134)
+      {
+        if (progress != null) progress.display((int)(progress_current), "--Updating schema version: " + schemaVersion + " -> 134...");
+        // Schemaversion 134 only updates the version number
+        schemaVersion = setSchemaVersionInTransaction(session, 134);
+        progress_current += progress_step;
+      }
+
       sc.logout();
       if (progress != null) progress.display(100, "Database updated successfully.");

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

@@ -25 +25 @@
 import java.util.Date;
 import java.util.Set;
+
+import net.sf.basedb.core.data.annotations.AnnotationLink;
+
 import java.util.Map;
 import java.util.HashMap;
@@ -40 +43 @@
 public class ProjectData
   extends OwnedData
-  implements NameableData, RemovableData, RegisteredData
+  implements NameableData, RemovableData, RegisteredData, AnnotatableData
 {
 
@@ -105 +108 @@
   // -------------------------------------------
 
+  /*
+    From the AnnotatableData interface
+    -------------------------------------------
+  */
+  private AnnotationSetData annotationSet;
+
+  /**
+    @since 3.10
+  */
+  @Override
+  public AnnotationSetData getAnnotationSet()
+  {
+    return annotationSet;
+  }
+  
+  /**
+    @since 3.10
+  */
+  @Override
+  public void setAnnotationSet(AnnotationSetData annotationSet)
+  {
+    this.annotationSet = annotationSet;
+  }
+  private Set<AnnotationLink> links;
+
+  /**
+    @since 3.10
+  */
+  @Override
+  public Set<AnnotationLink> getAnnotations()
+  {
+    return links;
+  }
+  void setAnnotations(Set<AnnotationLink> links)
+  {
+    this.links = links;
+  }
+  // -------------------------------------------
+  
   private int autoPermission;
   /**