Changeset 7860

Timestamp:

Oct 20, 2020, 3:30:21 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2224: Files should be annotatable

Annotation validation in the "Item overview" failed for any-to-any items (and probably also file set items) since we need to use the target item to get to the annotations.

Location:

trunk/src/core/net/sf/basedb/util/overview

Files:

• loader/AnnotationLoader.java (modified) (2 diffs)
• validator/AnnotationValidator.java (modified) (4 diffs)

trunk/src/core/net/sf/basedb/util/overview/loader/AnnotationLoader.java

@@ -55 +55 @@
 {
 
+  /**
+    Get the annotatable item from the node. This is in most cases
+    the {@link Node#getItem()} item, but can also be the target
+    item of an {@link AnyToAny} node or the file of a {@link FileSetMember}
+    node.
+    @since 3.17
+  */
+  public static Annotatable getAnnotatableFromNode(DbControl dc, Node node)
+  {
+    Annotatable annotatable = null;
+    Item nodeType = node.getItemType();
+    try
+    {
+      if (nodeType == Item.ANYTOANY)
+      {
+        // The parent item is the 'to' target of the any-to-any
+        AnyToAny any = (AnyToAny)node.getItem(dc);
+        annotatable = (Annotatable)any.getTo();
+      }
+      else if (nodeType == Item.FILESETMEMBER)
+      {
+        // The parent item is the 'file' item
+        FileSetMember member = (FileSetMember)node.getItem(dc);
+        annotatable = member.getFile();
+      }
+      else
+      {
+        annotatable = (Annotatable)node.getItem(dc);
+      }
+    }
+    catch (PermissionDeniedException ex)
+    {}
+    return annotatable;
+  }
+  
   public AnnotationLoader()
   {
@@ -68 +103 @@
   {
     NodeFactory<Annotation> nf = getNodeFactory(dc, context);
-    Annotatable parent = null;
-    Item parentNodeType = parentNode.getItemType();
-    try
-    {
-      if (parentNodeType == Item.ANYTOANY)
-      {
-        // The parent item is the 'to' target of the any-to-any
-        AnyToAny any = (AnyToAny)parentNode.getItem(dc);
-        parent = (Annotatable)any.getTo();
-      }
-      else if (parentNodeType == Item.FILESETMEMBER)
-      {
-        // The parent item is the 'file' item
-        FileSetMember member = (FileSetMember)parentNode.getItem(dc);
-        parent = member.getFile();
-      }
-      else
-      {
-        parent = (Annotatable)parentNode.getItem(dc);
-      }
-    }
-    catch (PermissionDeniedException ex)
-    {}
+    Annotatable parent = getAnnotatableFromNode(dc, parentNode);
 
     Node folderNode = null;

trunk/src/core/net/sf/basedb/util/overview/validator/AnnotationValidator.java

@@ -48 +48 @@
 import net.sf.basedb.util.overview.Validator;
 import net.sf.basedb.util.overview.filter.ItemTypeFilter;
+import net.sf.basedb.util.overview.loader.AnnotationLoader;
 
 /**
@@ -88 +89 @@
     super.postValidate(dc, context, node, parentNode);
     if (parentNode.getNodeType() == Node.Type.FOLDER) parentNode = parentNode.getParent();
-    Annotatable parent = (Annotatable)parentNode.getItem(dc);
-    Item parentItemType = parentNode.getItemType();
+    Annotatable parent = AnnotationLoader.getAnnotatableFromNode(dc, parentNode);
+    if (parent == null) return;
+    
+    Item parentItemType = parent.getType();
     
     Annotation a = (Annotation)node.getItem(dc);
@@ -221 +224 @@
   {
     super.postValidateFolder(dc, context, folderNode, parentNode);
-    Annotatable parent = (Annotatable)parentNode.getItem(dc);
+    Annotatable parent = AnnotationLoader.getAnnotatableFromNode(dc, parentNode);
+    if (parent == null) return;
+    Item parentItemType = parent.getType();
     
     // Check for 'Required by MIAME' annotations and duplicates
-    Set<AnnotationType> miame = OverviewUtil.getMiameAnnotationTypes(dc, context, parentNode.getItemType());
+    Set<AnnotationType> miame = OverviewUtil.getMiameAnnotationTypes(dc, context, parentItemType);
     Set<AnnotationType> all = new HashSet<AnnotationType>();
     Map<AnnotationType, Annotation> duplicates = new HashMap<AnnotationType, Annotation>();
@@ -249 +254 @@
         context.createFailure(Validator.ANNOTATION_INHERIT_MULTIPLE, parentNode, 
           "Duplicate annotations of type '" + dup.getKey().getName() + "'",
-          new Fix("Modify annotations", parentNode.getItem(), dup.getValue())
+          new Fix("Modify annotations", (BasicItem)parent, dup.getValue())
         );
       }