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

Timestamp:

Aug 24, 2009, 11:19:37 AM (13 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1360: Existing annotatation on an item may not be visible/editable in some cases

This should make sure that all existing annotations can be viewed and edited. The problem with the "Unhandled item: ANNOTATION..." will be fixed as part of #1361.

File:

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

trunk/www/common/annotations/list_annotations.jsp

@@ -43 +43 @@
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
+  import="net.sf.basedb.util.NameableComparator"
   import="net.sf.basedb.util.formatter.Formatter"
   import="net.sf.basedb.util.formatter.PrefixSuffixFormatter"
@@ -48 +49 @@
   import="net.sf.basedb.util.Values"
   import="java.util.List"
+  import="java.util.Set"
+  import="java.util.HashSet"
+  import="java.util.TreeSet"
+  import="java.util.Map"
+  import="java.util.HashMap"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -60 +66 @@
 final DbControl dc = sc.newDbControl();
 
+Set<AnnotationType> annotationTypes = null;
+Set<AnnotationType> protocolParameters = null;
+Map<AnnotationType, Annotation> existing = null;
+
 try
 {
   final Annotatable item = (Annotatable)itemType.getById(dc, itemId);
+  final boolean writePermission = item.hasPermission(Permission.WRITE);
+
   ItemQuery<AnnotationType> annotationTypeQuery = null;
   String message = null;
   boolean isProxy = item instanceof AnnotatableProxy;
 
+  // Load all annotation types that are possible for this item type
   if (isProxy)
   {
@@ -77 +90 @@
     annotationTypeQuery = Base.getAnnotationTypesQuery(itemType, false);
   }
-  final List<AnnotationType> annotationTypes = annotationTypeQuery.list(dc);
-  Protocol protocol = null;
-  boolean readProtocol = true;
-  try
-  {
-    protocol = item.getProtocol();
-  }
-  catch (PermissionDeniedException ex)
-  {
-    readProtocol = false;
-  }
-  final List<AnnotationType> protocolParameters = protocol == null ? 
-    null : Base.getProtocolParametersQuery(protocol).list(dc);
-  final boolean writePermission = item.hasPermission(Permission.WRITE);
+  annotationTypes = new TreeSet<AnnotationType>(new NameableComparator(false));
+  annotationTypes.addAll(annotationTypeQuery.list(dc));
 
   final AnnotationSet as = item.isAnnotated() ? item.getAnnotationSet() : null;
@@ -96 +97 @@
   if (as != null)
   {
+    // Load the existing annotations on the item
+    existing = new HashMap<AnnotationType, Annotation>();
+    List<Annotation> annotations = as.getAnnotations().list(dc);
+    for (Annotation a : annotations)
+    {
+      try
+      {
+        existing.put(a.getAnnotationType(), a);
+      }
+      catch (PermissionDeniedException ex)
+      {}
+    }
+    annotationTypes.addAll(existing.keySet());
+    
+    // Load inherited annotations
     ItemQuery<Annotation> inheritedQuery = as.getAllInheritedAnnotations();
     // Need FETCH JOIN because Postgres don't like the DISTINCT keyword
@@ -104 +120 @@
     inheritedAnnotations = inheritedQuery.list(dc);
   }
-%>
+  
+  // Load the possible protocol parameters
+  Protocol protocol = null;
+  boolean readProtocol = true;
+  try
+  {
+    protocol = item.getProtocol();
+  }
+  catch (PermissionDeniedException ex)
+  {
+    readProtocol = false;
+  }
+  ItemQuery<AnnotationType> parameterQuery = Base.getProtocolParametersQuery(protocol);
+  if (parameterQuery != null)
+  {
+    protocolParameters = new HashSet<AnnotationType>(parameterQuery.list(dc));
+    annotationTypes.removeAll(protocolParameters);
+  }
+  %>
   <base:page type="include">
   <base:body>
@@ -168 +202 @@
               for (AnnotationType at : annotationTypes)
               {
-                Annotation a = as != null && as.hasAnnotation(at) ? as.getAnnotation(at) : null;
+                Annotation a = existing != null ? existing.get(at) : null;
                 List<?> values = null;
                 Formatter formatter = null;
@@ -252 +286 @@
                 for (AnnotationType at : protocolParameters)
                 {
-                  Annotation a = as != null && as.hasAnnotation(at) ? as.getAnnotation(at) : null;
+                  Annotation a = existing != null ? existing.get(at) : null;
                   Formatter formatter = null;
                   List<?> values = null;