Changeset 5145 for trunk/www/common/overview/ajax.jsp

Timestamp:

Oct 20, 2009, 8:50:49 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1404: Use cached annotations in "item overview"

The tests in #1406 were successful. Also fixed an issue with icons in the outline for protocol parameters.

File:

• trunk/www/common/overview/ajax.jsp (modified) (2 diffs)

trunk/www/common/overview/ajax.jsp

@@ -24 +24 @@
   import="net.sf.basedb.core.SessionControl"
   import="net.sf.basedb.core.DbControl"
+  import="net.sf.basedb.core.Annotation"
+  import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.util.overview.GenericOverview"
@@ -52 +54 @@
       for (Node n : parent.getChildren())
       {
-        String title;
         String folderIcon = n.getNodeType() == Node.Type.FOLDER ? "Folder" : "Item";
-        if (n.getItemType() == Item.ANNOTATIONTYPE && parent.getItemType() == Item.PROTOCOL)
+        if (n.getItemType() == Item.ANNOTATIONTYPE)
         {
-          folderIcon = "ProtocolParameter";
+          if (parent.getItemType() == Item.PROTOCOL)
+          {
+            folderIcon = "ProtocolParameter";
+          }
+          else
+          {
+            try
+            {
+              AnnotationType at = (AnnotationType)n.getItem(dc);
+              if (at.isProtocolParameter()) folderIcon = "ProtocolParameter";
+            }
+            catch (Throwable t)
+            {}
+          }
         }
         else if (n.getItemType() == Item.ANNOTATION)
         {
           folderIcon = "Annotation";
+          try
+          {
+            AnnotationType at = ((Annotation)n.getItem(dc)).getAnnotationType();
+            if (at.isProtocolParameter()) folderIcon = "ProtocolParameter";
+          }
+          catch (Throwable t)
+          {}
         }       
         int numChildren = n.numChildren();