Changeset 6687

Timestamp:

Jan 20, 2015, 3:45:46 PM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1906: Display inherited annotations in list views

Added support for exporting inherited annotations to the table exporter.

Location:

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

Files:

• ExportedProperty.java (modified) (7 diffs)
• SimpleExport.java (modified) (3 diffs)

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

@@ -44 +44 @@
   public final String title;
   public final AnnotationType annotationType;
+  public final boolean loadInherited; 
   public final Unit unit;
   public final Formatter formatter;
@@ -52 +53 @@
   {
     PropertyPath propertyPath = metadata.getPropertyPath(path, false);
-    return new ExportedProperty(path, title, propertyPath, null, null, formatter, null);
+    return new ExportedProperty(path, title, propertyPath, null, false, null, formatter, null);
   }
 
@@ -67 +68 @@
     String title = p.length > 2 ? p[2] : p[0];
     AnnotationType at = null;
+    boolean loadInherited = false;
     Unit unit = null;
     String columnSuffix = null;
@@ -72 +74 @@
     if (name.startsWith("#") && annotatable) // && itemType != Item.SPOTDATA)
     {
+      loadInherited = name.startsWith("##");
       // Annotation: properties[i] = #annotationTypeId
-      int annotationTypeId = Values.getInt(name.substring(1));
+      int annotationTypeId = Values.getInt(loadInherited ? name.substring(2) : name.substring(1));
       at = AnnotationType.getById(dc, annotationTypeId);
       name = "annotationtype_"+annotationTypeId;
@@ -89 +92 @@
     if (columnPrefix != null) title = columnPrefix + title;
     if (columnSuffix != null) title += columnSuffix;
-    return new ExportedProperty(name, title, propertyPath, at, unit, formatter, dataloader);
+    return new ExportedProperty(name, title, propertyPath, at, loadInherited, unit, formatter, dataloader);
   }
 
@@ -95 +98 @@
     @since 2.15
   */
-  public ExportedProperty(String name, String title, PropertyPath propertyPath,
-      AnnotationType annotationType, Unit unit, Formatter formatter, DataLoader dataloader)
+  private ExportedProperty(String name, String title, PropertyPath propertyPath,
+      AnnotationType annotationType, boolean loadInherited, Unit unit, Formatter formatter, DataLoader dataloader)
   {
     this.name = name;
@@ -102 +105 @@
     this.propertyPath = propertyPath;
     this.annotationType = annotationType;
+    this.loadInherited = loadInherited;
     this.formatter = formatter == null ? new ToStringFormatter() : formatter;
     this.unit = unit;

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

@@ -582 +582 @@
           if (ep.annotationType != null)
           {
-            List<?> values = null;
+            List values = null;
             String unitSymbol = null;
             if (ep.dataloader == null)
@@ -589 +589 @@
               {
                 filter.setAnnotationType(ep.annotationType);
-                List<AnnotationSnapshot> s = manager.findAnnotations(dc, snapshot, filter, false);
-                if (s.size() == 1)
+                List<AnnotationSnapshot> list = manager.findAnnotations(dc, snapshot, filter, !ep.loadInherited, ep.loadInherited);
+                if (list.size() > 0)
                 {
                   Unit defaultUnit = ep.annotationType.getDefaultUnit();
+                  Type valueType = ep.annotationType.getValueType();
                   UnitConverter unitConverter = null;
                   if (defaultUnit != null)
@@ -599 +600 @@
                     if (ep.unit == null) unitSymbol = defaultUnit.getDisplaySymbol();
                   }
-                  values = s.get(0).getValues(unitConverter, ep.annotationType.getValueType());
+                  values = new ArrayList();
+                  for (AnnotationSnapshot s : list)
+                  {
+                    values.addAll(s.getValues(unitConverter, valueType));
+                  }
                 }
               }