Changeset 2469

Timestamp:

Jul 11, 2006, 6:21:02 PM (16 years ago)

Author:

dominic

Message:

annotate.jsp update to add categories and modified java doc comment for base.java

Location:

branches/dominic_annotations

Files:

• src/clients/web/net/sf/basedb/clients/web/Base.java (modified) (1 diff)
• www/common/annotations/annotate.jsp (modified) (3 diffs)

branches/dominic_annotations/src/clients/web/net/sf/basedb/clients/web/Base.java

@@ -615 +615 @@
   /**
     Gets the category that an annotation type belongs to. The result will include 
-    all categries owned by or shared to the logged in user or 
+    all categories owned by or shared to the logged in user or 
     the active project and belonging to the specified.
     @param dc The database control object obatined for the session
     @param annotationType The <code>AnnotationType</code> object
-    @return An <code>ItemQuery</code> object
+    @return the name of the <code>AnnotationTypeCategory</code> object
   */
   public static String getAnnotationTypesCategoryQuery(DbControl dc,AnnotationType annotationType)

branches/dominic_annotations/www/common/annotations/annotate.jsp

@@ -79 +79 @@
       String label = HTML.encodeTags(Values.trimString(at.getName(), 25));
       String fullLabel = HTML.encodeTags(at.getName());
+      String categoryname=HTML.encodeTags(Base.getAnnotationTypesCategoryQuery(dc,at));
       List values = null;
       if (as != null && as.hasAnnotation(at))
@@ -107 +108 @@
       }
       icon = "<img id=\"icon_"+at.getId()+"\" src=\"../../images/"+icon+"\" class=\"icon\">";
-      sb.append("<div class=\"param\" id=\"prompt_"+at.getId()+"\" onclick=\"parametersOnClick('"+at.getId()+"')\" onmouseover=\"Main.addClass(this, 'hover')\" onmouseout=\"Main.removeClass(this, 'hover')\" title=\""+fullLabel+"\">"+icon+label+"</div>");
+      sb.append("<div class=\"param\" id=\"prompt_"+at.getId()+"\" onclick=\"parametersOnClick('"+at.getId()+"')\" onmouseover=\"Main.addClass(this, 'hover')\" onmouseout=\"Main.removeClass(this, 'hover')\" title=\""+fullLabel+"\">"+icon+label+categoryname+"</div>");
       %>
       new Parameter('<%=at.getId()%>', '<%=HTML.javaScriptEncode(at.getName())%>', <%=at.getMultiplicity()%>, <%=at.isEnumeration()%>, false, values);
@@ -354 +355 @@
         </div>
         <base:icon image="hasvalues.gif" /> = has value(s)
+        <b>Here We Are ooooooooooooooo</b>
       </td>
       <td width="50%">