Changeset 7766

Timestamp:

Feb 6, 2020, 9:32:27 AM (22 months ago)

Author:

Nicklas Nordborg

Message:

References #2202: Include information from parent items in list pages

Adding formatter implementations to get nicer formatting both when exporting and in the list page.

Location:

trunk/src

Files:

• clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemAnnotationColumn.java (modified) (4 diffs)
• clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemColumn.java (modified) (3 diffs)
• clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemPropertyColumn.java (modified) (2 diffs)
• core/net/sf/basedb/util/formatter/CollectionFormatter.java (added)

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemAnnotationColumn.java

@@ -1 +1 @@
 package net.sf.basedb.clients.web.extensions.list;
 
-import java.util.ArrayList;
-import java.util.List;
 import java.util.Set;
+import java.util.TreeSet;
 
 import net.sf.basedb.core.Annotatable;
@@ -12 +11 @@
 import net.sf.basedb.util.filter.Filter;
 
+/**
+  Parent item column that load annotation values from the parent items.
+  @author nicklas
+  @since 3.16
+*/
 public class ParentItemAnnotationColumn 
   extends ParentItemColumn
@@ -29 +33 @@
   public Object getValue(DbControl dc, Annotatable item) 
   {
+    Set<Annotatable> parents = getParentItems(dc, item);
+    if (parents.size() == 0) return null;
     
-    Set<Annotatable> parents = getParentItems(dc, item);
-    List<Object> values = new ArrayList<>();
+    Set<Object> values = new TreeSet<>();
     for (Annotatable p : parents)
     {
@@ -39 +44 @@
       }
     }
-    
-    return values;
+    return values.size() == 0 ? null : values;
   }
 

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemColumn.java

@@ -3 +3 @@
 import java.util.Set;
 
+import net.sf.basedb.clients.web.formatter.FormatterFactory;
+import net.sf.basedb.clients.web.formatter.LinkedItemFormatter;
 import net.sf.basedb.core.Annotatable;
 import net.sf.basedb.core.AnnotationType;
@@ -9 +11 @@
 import net.sf.basedb.core.ItemSubtype;
 import net.sf.basedb.core.Metadata;
+import net.sf.basedb.core.StringUtil;
 import net.sf.basedb.core.Metadata.PropertyPath;
 import net.sf.basedb.util.AnnotationUtil;
 import net.sf.basedb.util.Values;
 import net.sf.basedb.util.filter.Filter;
+import net.sf.basedb.util.formatter.CollectionFormatter;
+import net.sf.basedb.util.formatter.NameableFormatter;
+import net.sf.basedb.util.formatter.ToStringFormatter;
 
 /**
@@ -37 +43 @@
     Item parentType = Item.valueOf(tmp[1]);
     ItemSubtype subtype = ItemSubtype.getById(dc, Values.getInt(tmp[2]));
-    
+    Filter<Annotatable> parentFilter = new SubtypeFilter(subtype);
     ParentItemColumn col = null;
     if (tmp[3].startsWith("#"))
     {
       AnnotationType at = AnnotationType.getById(dc, Values.getInt(tmp[3].substring(1)));
-      col = new ParentItemAnnotationColumn(expr, new SubtypeFilter(subtype), helper, at);
+      col = new ParentItemAnnotationColumn(expr, parentFilter, helper, at);
       col.setTitle(at.getName() + " [A]");
       col.setTooltip(subtype.getName() + " › "+at.getName());
       col.setValueType(at.getValueType());
+      col.setExportFormatter(FormatterFactory.getTypeFormatter(dc.getSessionControl(), at.getValueType()));
+      col.setFormatter(new CollectionFormatter(col.getExportFormatter()));
     }
     else
     {
-      Metadata m = Metadata.getInstance(parentType.getItemClass());
-      PropertyPath property = m.getPropertyPath(tmp[3], false);
-      col = new ParentItemPropertyColumn(expr, new SubtypeFilter(subtype), helper, property);
-      col.setTitle(subtype.getName()+"."+tmp[3]);
+      String path = tmp[3];
+      PropertyPath property = null;
+      if (!".".equals(path)) // special case '.' is equal to the "parent" item
+      {
+        Metadata m = Metadata.getInstance(parentType.getItemClass());
+        property = m.getPropertyPath(path, false);
+        col = new ParentItemPropertyColumn(expr, parentFilter, helper, property);
+        col.setTitle(subtype.getName()+"."+path);
+        col.setTooltip(subtype.getName() + " › "+path);
+      }
+      else
+      {
+        col = new ParentItemPropertyColumn(expr, parentFilter, helper, null);
+        col.setTitle(subtype.getName());
+        col.setTooltip(subtype.getName());
+      }
+      if (property == null || property.getHibernateType().isEntityType())
+      {
+        col.setExportFormatter(new NameableFormatter());
+        col.setFormatter(new CollectionFormatter(new LinkedItemFormatter()));
+      }
+      else
+      {
+        col.setExportFormatter(new ToStringFormatter<>());
+        col.setFormatter(new CollectionFormatter(col.getExportFormatter()));
+      }
     }
     

trunk/src/clients/web/net/sf/basedb/clients/web/extensions/list/ParentItemPropertyColumn.java

@@ -1 +1 @@
 package net.sf.basedb.clients.web.extensions.list;
 
-import java.util.ArrayList;
-import java.util.List;
+import java.util.LinkedHashSet;
 import java.util.Set;
 
@@ -25 +24 @@
   public Object getValue(DbControl dc, Annotatable item) 
   {
-    
     Set<Annotatable> parents = getParentItems(dc, item);
-    List<Object> values = new ArrayList<>();
+    if (parents.size() == 0) return null;
+
+    Set<Object> values = new LinkedHashSet<>();
     for (Annotatable p : parents)
     {
-      values.add(property.getValue(dc, p));
+      values.add(property == null ? p : property.getValue(dc, p));
     }
     
-    return values;
+    return values.size() == 0 ? null : values;
   }
 
-
 }