Changeset 5145 for trunk/www/common/overview/tree.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/tree.jsp (modified) (6 diffs)

trunk/www/common/overview/tree.jsp

@@ -26 +26 @@
   import="net.sf.basedb.core.Item"
   import="net.sf.basedb.core.BasicItem"
+  import="net.sf.basedb.core.Annotation"
+  import="net.sf.basedb.core.AnnotationType"
   import="net.sf.basedb.core.Nameable"
   import="net.sf.basedb.core.ItemContext"
@@ -40 +42 @@
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
 <%!
-String generateSubTree(Node startNode, String ID, boolean showFailures)
+String generateSubTree(DbControl dc, Node startNode, String ID, boolean showFailures)
 {
   StringBuilder sb = new StringBuilder();
@@ -54 +56 @@
     String folderIcon = child.getNodeType() == Node.Type.FOLDER ? "Folder" : "Item";
     String tooltip = "";
-    if (child.getItemType() == Item.ANNOTATIONTYPE && startNode.getItemType() == Item.PROTOCOL)
-    {
-      folderIcon = "ProtocolParameter";
+    if (child.getItemType() == Item.ANNOTATIONTYPE)
+    {
+      if (startNode.getItemType() == Item.PROTOCOL)
+      {
+        folderIcon = "ProtocolParameter";
+      }
+      else
+      {
+        try
+        {
+          AnnotationType at = (AnnotationType)child.getItem(dc);
+          if (at.isProtocolParameter()) folderIcon = "ProtocolParameter";
+        }
+        catch (Throwable t)
+        {}
+      }
     }
     else if (child.getItemType() == Item.ANNOTATION)
     {
       folderIcon = "Annotation";
+      try
+      {
+        AnnotationType at = ((Annotation)child.getItem(dc)).getAnnotationType();
+        if (at.isProtocolParameter()) folderIcon = "ProtocolParameter";
+      }
+      catch (Throwable t)
+      {}
     }
     
@@ -128 +150 @@
              sb.append("'showInfo(\"").append(child.getId()).append("\")','").append(HTML.javaScriptEncode(tooltip)).append("', '").append(child.getId()).append("')\n");
     }
-    sb.append(generateSubTree(child, ID, showFailures));
+    sb.append(generateSubTree(dc, child, ID, showFailures));
   }
   return sb.toString();
@@ -137 +159 @@
 final String ID = sc.getId();
 final float scale = Base.getScale(sc);
-final DbControl dc = null;
+final DbControl dc = sc.newDbControl();
 try
 {
@@ -208 +230 @@
     IconStore.addIcon('AnnotatioChildnErrorSelected', path + 'annotationchilderrorselected.gif', 18, 16);
     var node<%=rootNode.hashCode()%> = JoustMenu.addMenuItem(-1, '<%=rootIcon%>', '<%=HTML.javaScriptEncode(rootItem.getName())%>', 'showInfo("<%=rootNode.getId()%>")', '', '<%=rootNode.getId()%>');
-    <%=generateSubTree(rootNode, ID, showFailures)%>
+    <%=generateSubTree(dc, rootNode, ID, showFailures)%>
     JoustMenu.menuItems[node<%=rootNode.hashCode()%>].isOpen = true;
     JoustMenu.draw('joust');