Changeset 6736

Timestamp:

Feb 13, 2015, 1:07:29 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1910: Disable annotation inheritance for annotation types

Do not include inherited annotation columns in the table exporter if the annotation type has disabled inheritance.

Location:

trunk/src/clients/web/net/sf/basedb/clients/web/plugins

Files:

• ExportedProperty.java (modified) (1 diff)
• SimpleExport.java (modified) (1 diff)

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/ExportedProperty.java

@@ -78 +78 @@
       int annotationTypeId = Values.getInt(loadInherited ? name.substring(2) : name.substring(1));
       at = AnnotationType.getById(dc, annotationTypeId);
+      if (at.getDisableInheritance() && loadInherited) return null;
       name = "annotationtype_"+annotationTypeId;
       if (sameUnits && at.supportUnits()) 

trunk/src/clients/web/net/sf/basedb/clients/web/plugins/SimpleExport.java

@@ -302 +302 @@
       ExportedProperty ep = ExportedProperty.parse(dc, metadata, column, columnPrefix, 
         annotatable, formatter, sameUnits, dataloader);
-      exportedProperties.add(ep);
-      properties.add(ep.name);
+      if (ep != null)
+      {
+        exportedProperties.add(ep);
+        properties.add(ep.name);
+      }
     }