Changeset 5984 for trunk/www/common/annotations/list_annotations.jsp

Timestamp:

Feb 24, 2012, 8:33:47 AM (12 years ago)

Author:

Nicklas Nordborg

Message:

References #1655: GUI improvements

Show name of subtype if available in list with inherited annotations.

File:

• trunk/www/common/annotations/list_annotations.jsp (modified) (3 diffs)

trunk/www/common/annotations/list_annotations.jsp

@@ -36 +36 @@
   import="net.sf.basedb.core.Unit"
   import="net.sf.basedb.core.Nameable"
+  import="net.sf.basedb.core.Subtypable"
+  import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.ItemResultList"
@@ -424 +426 @@
               Formatter formatter = FormatterFactory.getAnnotationFormatter(sc, ann, null);
               Nameable aItem = null;
+              String fromType = a.getItemType().toString();
               try
               {
@@ -431 +434 @@
               catch (PermissionDeniedException ex)
               {}
-              %>
+              if (aItem instanceof Subtypable)
+              {
+                try
+                {
+                  ItemSubtype subtype = ((Subtypable)aItem).getItemSubtype();
+                  if (subtype != null) fromType = subtype.getName();
+                }
+                catch (PermissionDeniedException ex)
+                {}
+              }             %>
               <tbl:row>
-                <tbl:cell column="annotation"><base:icon image="<%=icon%>" />&nbsp;<%=Base.getLinkedName(ID, at, at == null, true)%></tbl:cell>
-                <tbl:cell column="item"><%=Base.getLinkedName(ID, aItem, aItem == null, true)%><%=aItem != null ? " ["+aItem.getType()+"]" : ""%></tbl:cell>
+                <tbl:cell column="annotation"><base:icon image="<%=icon%>" /><%=Base.getLinkedName(ID, at, at == null, true)%></tbl:cell>
+                <tbl:cell column="item"><%=Base.getLinkedName(ID, aItem, aItem == null, true)%><%=aItem != null ? " <span class=\"itemsubtype\">("+fromType+")</span>" : ""%></tbl:cell>
                 <tbl:cell column="values">
                   <%=values == null || values.size() == 0 ?