Changeset 7724

Timestamp:

06/05/09 18:03:39 (14 months ago)

Author:

ssterling

Message:

Added ability to edit the Citation and Body of an Annotation. Changed naming of classes and templates to match the rest of the schema.

Addresses Job Order 8927

Location:

head/ambra/webapp/src

Files:

• main/java/org/topazproject/ambra/admin/action/ManageAnnotationAction.java (moved) (moved from head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/EditOneAnnotationAction.java) (11 diffs)
• main/java/org/topazproject/ambra/admin/action/ManageFlagsAction.java (moved) (moved from head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/EditAnnotationAction.java) (1 diff)
• main/java/org/topazproject/ambra/annotation/service/AnnotationService.java (modified) (4 diffs)
• main/resources/struts.xml (modified) (2 diffs)
• main/webapp/admin/manageAnnotation.ftl (moved) (moved from head/ambra/webapp/src/main/webapp/admin/editOneAnnotation.ftl) (3 diffs)
• main/webapp/admin/manageFlags.ftl (moved) (moved from head/ambra/webapp/src/main/webapp/admin/editAnnotation.ftl) (2 diffs)
• main/webapp/admin/templates/standardHeader.ftl (modified) (2 diffs)
• test/java/org/topazproject/ambra/admin/action/ProcessFlagsActionTest.java (modified) (1 diff)

head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/ManageAnnotationAction.java

@@ -27 +27 @@
 import org.topazproject.ambra.annotation.service.WebAnnotation;
 import org.topazproject.ambra.models.ArticleAnnotation;
+import org.topazproject.ambra.models.UserProfile;
+import org.topazproject.ambra.admin.service.CitationService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -32 +34 @@
 
 @SuppressWarnings("serial")
-public class EditOneAnnotationAction extends BaseAdminActionSupport {
-  private static final Log log = LogFactory.getLog(EditOneAnnotationAction.class);
-
-  private String annotationId;
+public class ManageAnnotationAction extends BaseAdminActionSupport {
+  private static final Log log = LogFactory.getLog(ManageAnnotationAction.class);
+
+  private String        annotationId;
   private WebAnnotation annotation;
-  private String saveAnnotationContext;
+  private String        annotationBody;
+  private String        annotationContext;
+  private String        citationId;
+  private String        citationDisplayYear;
+  private String        citationVolumeNumber;
+  private String        citationIssue;
+  private String        citationTitle;
+  private String        citationELocationId;
+  private String        citationJournal;
+  private String        citationDoi;
+  private String[]      citationAuthorIds;
+  private String[]      citationAuthorGivenNames;
+  private String[]      citationAuthorSurnames;
+  private String[]      citationAuthorSuffixes;
+  private int           citationAuthorDeleteIndex;
+  private String[]      citationCollaborativeAuthorNames;
+  private int           citationCollaborativeAuthorDeleteIndex;
+
   private AnnotationService annotationService;
   private AnnotationConverter annotationConverter;
+  private CitationService citationService;
 
   @Override
@@ -49 +69 @@
 
   /**
-   * Struts Action to load (query from the database) an Annotation.
+   * Struts Action to load (query from the database) an Annotation and its Citation,
+   * if a Citation exists.
    *
    * @return the struts status
@@ -63 +84 @@
       ArticleAnnotation a = annotationService.getArticleAnnotation(annotationId);
       annotation = annotationConverter.convert(a, true, true);
+      if (annotationId == null)
+        annotationId = annotation.getId();
+      if (annotationBody == null)
+        annotationBody = annotation.getEscapedComment();
+      if (annotationContext == null)
+        annotationContext = annotation.getContext();
+      if (annotation.getCitation() != null) {
+        if (citationId == null && annotation.getCitation().getId() != null)
+          citationId = annotation.getCitation().getId().toString();
+        if (citationDisplayYear == null)
+          citationDisplayYear = annotation.getCitation().getDisplayYear();
+        if (citationVolumeNumber == null) {
+          if (annotation.getCitation().getVolumeNumber() != null)
+            citationVolumeNumber = annotation.getCitation().getVolumeNumber().toString();
+          if (citationVolumeNumber == null || citationVolumeNumber.trim().length() < 1)
+            citationVolumeNumber = annotation.getCitation().getVolume();
+        }
+        if (citationIssue == null)
+          citationIssue = annotation.getCitation().getIssue();
+        if (citationTitle == null)
+          citationTitle = annotation.getCitation().getTitle();
+        if (citationELocationId == null)
+          citationELocationId = annotation.getCitation().getELocationId();
+        if (citationJournal == null)
+          citationJournal = annotation.getCitation().getJournal();
+        if (citationDoi == null)
+          citationDoi = annotation.getCitation().getDoi();
+
+        if (annotation.getCitation().getAuthors() != null
+            && annotation.getCitation().getAuthors().size() > 0) {
+          citationAuthorIds = new String[annotation.getCitation().getAuthors().size()];
+          citationAuthorGivenNames = new String[annotation.getCitation().getAuthors().size()];
+          citationAuthorSurnames = new String[annotation.getCitation().getAuthors().size()];
+          citationAuthorSuffixes = new String[annotation.getCitation().getAuthors().size()];
+          int authorIndex = 0;
+          for (UserProfile author : annotation.getCitation().getAuthors()) {
+            if (author.getId() != null) {
+              citationAuthorIds[authorIndex] = author.getId().toString();
+              citationAuthorGivenNames[authorIndex] = author.getGivenNames();
+              citationAuthorSurnames[authorIndex] = author.getSurnames();
+              citationAuthorSuffixes[authorIndex] = author.getSuffix();
+              authorIndex++;
+            }
+          }
+        }
+        if (annotation.getCitation().getCollaborativeAuthors() != null
+            && annotation.getCitation().getCollaborativeAuthors().size() > 0) {
+          citationCollaborativeAuthorNames
+              = new String[annotation.getCitation().getCollaborativeAuthors().size()];
+          int authorIndex = 0;
+          for (String author : annotation.getCitation().getCollaborativeAuthors()) {
+            citationCollaborativeAuthorNames[authorIndex] = author;
+            authorIndex++;
+          }
+        }
+      }
+
     } catch (IllegalArgumentException iae) {
       addActionError("There is no Annotation with the ID: " + annotationId);
@@ -72 +150 @@
 
   /**
-   * Struts Action to save an Annotation.
+   * Struts Action to save an Annotation and its Citation (if the Annotation has a Citation).
    *
    * @return the struts status
@@ -79 +157 @@
   @Transactional(rollbackFor = { Throwable.class })
   public String saveAnnotation() throws Exception {
-    annotationService.updateContext(annotationId, saveAnnotationContext);
-    addActionMessage("Annotation: " + annotationId + ", Updated Context: " + saveAnnotationContext);
+    annotationService.updateBodyAndContext(annotationId, annotationBody, annotationContext);
+    addActionMessage("Annotation Context is now: " + annotationContext);
+    addActionMessage("Annotation Body is now: " + annotationBody);
+
+    //  If there is a Citation, update its information.
+    if (citationId != null && citationId.trim().length() > 0) {
+      citationService.updateCitation(citationId, citationTitle, citationDisplayYear,
+          citationJournal, citationVolumeNumber, citationIssue, citationELocationId, citationDoi);
+      if (citationDisplayYear != null)
+        addActionMessage("Citation Display Year is now: " + citationDisplayYear);
+      if (citationVolumeNumber != null)
+        addActionMessage("Citation Volume Number is now: " + citationVolumeNumber);
+      if (citationIssue != null)
+        addActionMessage("Citation Issue is now: " + citationIssue);
+      if (citationTitle != null)
+        addActionMessage("Citation Title is now: " + citationTitle);
+      if (citationELocationId != null)
+        addActionMessage("Citation eLocationId is now: " + citationELocationId);
+      if (citationJournal != null)
+        addActionMessage("Citation Journal is now: " + citationJournal);
+      if (citationDoi != null)
+        addActionMessage("Citation DOI is now: " + citationDoi);
+
+      //  Update all existing Citation Authors.
+      if (citationAuthorSurnames.length > 1) {
+        for (int i=0; i < citationAuthorSurnames.length - 1; i++) {
+          citationService.updateAuthor(citationAuthorIds[i].trim(), citationAuthorSurnames[i].trim(),
+              citationAuthorGivenNames[i].trim(), citationAuthorSuffixes[i].trim());
+          if (i != citationAuthorDeleteIndex) { // No "updated" message for deleted user.
+            addActionMessage("Updated citation author: " + citationAuthorGivenNames[i].trim() + " "
+                + citationAuthorSurnames[i].trim() + " " + citationAuthorSuffixes[i].trim());
+          }
+        }
+      }
+
+      //  Delete a Citation Author if a "Delete Author" link has been clicked.
+      if (citationAuthorDeleteIndex > -1) {
+        citationService.deleteAuthor(citationId, citationAuthorIds[citationAuthorDeleteIndex]);
+        addActionMessage("Deleted citation author: "
+            + citationAuthorGivenNames[citationAuthorDeleteIndex].trim()+ " "
+            + citationAuthorSurnames[citationAuthorDeleteIndex].trim() + " "
+            + citationAuthorSuffixes[citationAuthorDeleteIndex].trim());
+      }
+
+      //  Add a new Citation Author, if one exists.
+      if (citationAuthorGivenNames[citationAuthorSurnames.length - 1].trim().length() > 0
+          || citationAuthorSurnames[citationAuthorSurnames.length - 1].trim().length() > 0) {
+        citationService.addAuthor(citationId,
+            citationAuthorSurnames[citationAuthorSurnames.length - 1].trim(),
+            citationAuthorGivenNames[citationAuthorSurnames.length - 1].trim(),
+            citationAuthorSuffixes[citationAuthorSurnames.length - 1].trim());
+        addActionMessage("Added citation author: "
+            + citationAuthorGivenNames[citationAuthorSurnames.length - 1].trim() + " "
+            + citationAuthorSurnames[citationAuthorSurnames.length - 1].trim() + " "
+            + citationAuthorSuffixes[citationAuthorSurnames.length - 1].trim());
+      }
+      citationAuthorIds = null;
+      citationAuthorGivenNames = null;
+      citationAuthorSurnames = null;
+      citationAuthorSuffixes = null;
+
+
+      //  Update all existing Collaborative Authors.
+      if (citationCollaborativeAuthorNames.length > 0) {
+        for (int i=0; i < citationCollaborativeAuthorNames.length - 1; i++) {
+          citationService.updateCollaborativeAuthor(
+              citationId, i, citationCollaborativeAuthorNames[i].trim());
+          if (i != citationCollaborativeAuthorDeleteIndex) { // No "updated" message for deleted user.
+            addActionMessage("Updated collaborative author: "
+                + citationCollaborativeAuthorNames[i].trim());
+          }
+        }
+      }
+
+      //  Delete a Collaborative Author if a "Delete Collaborative Author" link has been clicked.
+      if (citationCollaborativeAuthorDeleteIndex > -1) {
+        citationService.deleteCollaborativeAuthor(
+            citationId, citationCollaborativeAuthorDeleteIndex);
+        addActionMessage("Deleted collaborative author: "
+            + citationCollaborativeAuthorNames[citationCollaborativeAuthorDeleteIndex].trim());
+      }
+
+      //  Add a new Collaborative Author, if one exists.
+      if (citationCollaborativeAuthorNames[citationCollaborativeAuthorNames.length - 1].trim()
+          .length() > 0) {
+        citationService.addCollaborativeAuthor(citationId,
+            citationCollaborativeAuthorNames[citationCollaborativeAuthorNames.length - 1].trim());
+        addActionMessage("Added collaborative author: "
+            + citationCollaborativeAuthorNames[citationCollaborativeAuthorNames.length - 1].trim());
+      }
+      citationCollaborativeAuthorNames = null;
+    }  //  End if citation exists.
+
     return loadAnnotation();  //  returns SUCCESS if the Annotation query succeeded.
   }
 
+  /**
+   * Perform basic action necessary for the querying and display of data through this Action class.
+   * @return Always return false.
+   */
   private boolean setCommonFields() {
     initJournal(); // create a faux journal object for template
@@ -90 +263 @@
 
 
+  /**
+   * Get the Annotation that is to be edited.
+   * @return the Annotation that is to be edited
+   */
   public WebAnnotation getAnnotation() {
     return annotation;
@@ -101 +278 @@
     return annotationId;
   }
-
   /**
    * Set the Annotation ID.
@@ -111 +287 @@
 
   /**
+   * Get the body of the Annotation.
+   * @return The annotation body
+   */
+  public String getAnnotationBody() {
+    return annotationBody;
+  }
+  /**
+   * Set the body of this Annotation.
+   * @param annotationBody The body of this Annotation
+   */
+  public void setAnnotationBody(String annotationBody) {
+    this.annotationBody = annotationBody;
+  }
+
+  /**
    * Get Annotation Context, meaning the x-pointer location of this Annotation inside its Article.
    * @return The annotation context, the x-pointer location of this Annotation inside its Article
    */
   public String getAnnotationContext() {
-    return saveAnnotationContext;
-  }
-
+    return annotationContext;
+  }
   /**
    * Set the Annotation Context, the x-pointer location of this Annotation inside its Article.
@@ -123 +313 @@
    */
   public void setAnnotationContext(String annotationContext) {
-    this.saveAnnotationContext = annotationContext;
+    this.annotationContext = annotationContext;
+  }
+
+  /**
+   * Get Citation Id.
+   * @return the ID of this Citation
+   */
+  public String getCitationId() {
+    return citationId;
+  }
+  /**
+   * Set the Citation ID.
+   * @param citationId the ID of this Citation
+   */
+  public void setCitationId(String citationId) {
+    this.citationId = citationId;
+  }
+
+  /**
+   * Get the Display Year of this Annotation Citation.
+   * @return The Display Year of this Annotation Citation
+   */
+  public String getCitationDisplayYear() {
+    return citationDisplayYear;
+  }
+  /**
+   * Set the Display Year of this Annotation Citation.
+   * @param citationDisplayYear The Display Year of this Annotation Citation
+   */
+  public void setCitationDisplayYear(String citationDisplayYear) {
+    this.citationDisplayYear = citationDisplayYear;
+  }
+
+  /**
+   * Get the Volume Number of the Article to which this Annotation Citation is relevant.
+   * @return The Volume Number of the Article to which this Annotation Citation is relevant
+   */
+  public String getCitationVolumeNumber() {
+    return citationVolumeNumber;
+  }
+  /**
+   * Set the Volume Number of the Article to which this Annotation Citation is relevant.
+   * @param citationVolumeNumber The Volume Number of the Article to
+   *   which this Annotation Citation is relevant
+   */
+  public void setCitationVolumeNumber(String citationVolumeNumber) {
+    this.citationVolumeNumber = citationVolumeNumber;
+  }
+
+  /**
+   * Get the Issue of the Article to which this Annotation Citation is relevant.
+   * @return The Issue of the Article to which this Annotation Citation is relevant
+   */
+  public String getCitationIssue() {
+    return citationIssue;
+  }
+  /**
+   * Set the Issue of the Article to which this Annotation Citation is relevant.
+   * @param citationIssue The Issue of the Article to
+   *   which this Annotation Citation is relevant
+   */
+  public void setCitationIssue(String citationIssue) {
+    this.citationIssue = citationIssue;
+  }
+
+  /**
+   * Get the Title of this Annotation Citation.
+   * @return The Title of this Annotation Citation
+   */
+  public String getCitationTitle() {
+    return citationTitle;
+  }
+  /**
+   * Set the Title of this Annotation Citation.
+   * @param citationTitle The Title of this Annotation Citation
+   */
+  public void setCitationTitle(String citationTitle) {
+    this.citationTitle = citationTitle;
+  }
+
+  /**
+   * Get the eLocationId for this Annotation Citation.
+   * @return The eLocationId for this Annotation Citation
+   */
+  public String getCitationELocationId() {
+    return citationELocationId;
+  }
+  /**
+   * Set the eLocationId for this Annotation Citation.
+   * @param citationELocationId The eLocationId for this Annotation Citation
+   */
+  public void setCitationELocationId(String citationELocationId) {
+    this.citationELocationId = citationELocationId;
+  }
+
+  /**
+   * Get the Journal of the Article to which this Annotation Citation is relevant.
+   * @return The Journal of the Article to which this Annotation Citation is relevant
+   */
+  public String getCitationJournal() {
+    return citationJournal;
+  }
+  /**
+   * Set the Journal of the Article to which this Annotation Citation is relevant.
+   * @param citationJournal The Journal of the Article to
+   *   which this Annotation Citation is relevant
+   */
+  public void setCitationJournal(String citationJournal) {
+    this.citationJournal = citationJournal;
+  }
+
+  /**
+   * Get the DOI of this Annotation Citation.
+   * @return The DOI of this Annotation Citation
+   */
+  public String getCitationDoi() {
+    return citationDoi;
+  }
+  /**
+   * Set the DOI of this Annotation Citation.
+   * @param citationDoi The DOI of this Annotation Citation
+   */
+  public void setCitationDoi(String citationDoi) {
+    this.citationDoi = citationDoi;
+  }
+
+  /**
+   * Get all of the IDs for the Authors of this Citation.
+   * @return the IDs for the Authors of this Citation
+   */
+  public String[] getCitationAuthorIds() {
+    return citationAuthorIds;
+  }
+  /**
+   * Set all of the IDs for the Authors of this Citation.
+   * @param citationAuthorIds the IDs for the Authors of this Citation
+   */
+  public void setCitationAuthorIds(String[] citationAuthorIds) {
+    this.citationAuthorIds = citationAuthorIds;
+  }
+
+  /**
+   * Get all of the Given Names for the Authors of this Citation.
+   * @return the Given Names for the Authors of this Citation
+   */
+  public String[] getCitationAuthorGivenNames() {
+    return citationAuthorGivenNames;
+  }
+  /**
+   * Set all of the Given Names for the Authors of this Citation.
+   * @param citationAuthorGivenNames the Given Names for the Authors of this Citation
+   */
+  public void setCitationAuthorGivenNames(String[] citationAuthorGivenNames) {
+    this.citationAuthorGivenNames = citationAuthorGivenNames;
+  }
+
+  /**
+   * Get all of the Surnames for the Authors of this Citation.
+   * @return the Surnames for the Authors of this Citation
+   */
+  public String[] getCitationAuthorSurnames() {
+    return citationAuthorSurnames;
+  }
+  /**
+   * Set all of the Surnames for the Authors of this Citation.
+   * @param citationAuthorSurnames the Surnames for the Authors of this Citation
+   */
+  public void setCitationAuthorSurnames(String[] citationAuthorSurnames) {
+    this.citationAuthorSurnames = citationAuthorSurnames;
+  }
+
+  /**
+   * Get all of the name Suffixes for the Authors of this Citation.
+   * @return the name Suffixes for the Authors of this Citation
+   */
+  public String[] getCitationAuthorSuffixes() {
+    return citationAuthorSuffixes;
+  }
+  /**
+   * Set all of the name Suffixes for the Authors of this Citation.
+   * @param citationAuthorSuffixes the name Suffixes for the Authors of this Citation
+   */
+  public void setCitationAuthorSuffixes(String[] citationAuthorSuffixes) {
+    this.citationAuthorSuffixes = citationAuthorSuffixes;
+  }
+
+  /**
+   * Get the Index of the Citation Author which is to be deleted from this Citation.
+   * @return The Index of the Citation Author to be deleted
+   */
+  public int getCitationAuthorDeleteIndex() {
+    return citationAuthorDeleteIndex;
+  }
+  /**
+   * Set the Index of the Citation Author which is to be deleted from this Citation.
+   * @param citationAuthorDeleteIndex The Index of the Citation Author to be deleted
+   */
+  public void setCitationAuthorDeleteIndex(int citationAuthorDeleteIndex) {
+    this.citationAuthorDeleteIndex = citationAuthorDeleteIndex;
+  }
+
+  /**
+   * Get all of the Names for the Collaborative Authors for this Citation.
+   * @return the Names for the Collaborative Authors for this Citation
+   */
+  public String[] getCitationCollaborativeAuthorNames() {
+    return citationCollaborativeAuthorNames;
+  }
+  /**
+   * Set all of the Names for the Collaborative Authors for this Citation.
+   * @param citationCollaborativeAuthorNames Names for the Collaborative Authors for this Citation
+   */
+  public void setCitationCollaborativeAuthorNames(String[] citationCollaborativeAuthorNames) {
+    this.citationCollaborativeAuthorNames = citationCollaborativeAuthorNames;
+  }
+
+  /**
+   * Get the Index of the Collaborative Author which is to be deleted from this Citation.
+   * @return The Index of the Collaborative Author to be deleted
+   */
+  public int getCitationCollaborativeAuthorDeleteIndex() {
+    return citationCollaborativeAuthorDeleteIndex;
+  }
+  /**
+   * Set the Index of the Collaborative Author which is to be deleted from this Citation.
+   * @param citationCollaborativeAuthorDeleteIndex Index of the Collaborative Author to be deleted
+   */
+  public void setCitationCollaborativeAuthorDeleteIndex(int citationCollaborativeAuthorDeleteIndex){
+    this.citationCollaborativeAuthorDeleteIndex = citationCollaborativeAuthorDeleteIndex;
   }
 
@@ -139 +557 @@
     this.annotationConverter = converter;
   }
+
+  /**
+   * Set CitationService.
+   * @param citationService the citation service to set
+   */
+  public void setCitationService(CitationService citationService) {
+    this.citationService = citationService;
+  }
+
 }

head/ambra/webapp/src/main/java/org/topazproject/ambra/admin/action/ManageFlagsAction.java

@@ -44 +44 @@
 
 @SuppressWarnings("serial")
-public class EditAnnotationAction extends BaseAdminActionSupport {
-  private static final Log log = LogFactory.getLog(EditAnnotationAction.class);
+public class ManageFlagsAction extends BaseAdminActionSupport {
+  private static final Log log = LogFactory.getLog(ManageFlagsAction.class);
 
   private FlagManagementService flagManagementService;

head/ambra/webapp/src/main/java/org/topazproject/ambra/annotation/service/AnnotationService.java

@@ -27 +27 @@
 import java.util.List;
 import java.util.Set;
+import java.io.UnsupportedEncodingException;
 
 import org.apache.commons.beanutils.BeanUtilsBean;
@@ -53 +54 @@
 import org.topazproject.ambra.models.Citation;
 import org.topazproject.ambra.models.UserProfile;
+import org.topazproject.ambra.models.RatingContent;
 import org.topazproject.ambra.user.AmbraUser;
 import org.topazproject.ambra.xacml.AbstractSimplePEP;
@@ -615 +617 @@
   }
 
-
-  /**
-   * Set the annotation context.
+  /**
+   * Update the annotation body and context.
    *
    * @param id the annotation id
+   * @param body
    * @param context the context to set
-   *
    * @throws OtmException on an error
    * @throws SecurityException if a security policy prevented this operation
@@ -627 +628 @@
    */
   @Transactional(rollbackFor = { Throwable.class })
-  public void updateContext(String id, String context)
-    throws OtmException, SecurityException, IllegalArgumentException {
+  public void updateBodyAndContext(String id, String body, String context)
+    throws OtmException, SecurityException, IllegalArgumentException, UnsupportedEncodingException {
 
     pep.checkAccess(AnnotationsPEP.UPDATE_ANNOTATION, URI.create(id));
 
-    Annotation<?> a = session.get(Annotation.class, id);
+    ArticleAnnotation a = session.get(ArticleAnnotation.class, id);
     if (a == null)
-      throw new IllegalArgumentException("invalid annoation id: " + id);
-
+      throw new IllegalArgumentException("invalid annotation id: " + id);
+
+    AnnotationBlob blob = a.getBody();
+    blob.setBody(body.getBytes(getEncodingCharset()));
     a.setContext(context);
   }

head/ambra/webapp/src/main/resources/struts.xml

@@ -881 +881 @@
 
     <!-- Navigate to the Manage Flags page without doing any processing of those flags -->
-    <action name="editAnnotation" class="org.topazproject.ambra.admin.action.EditAnnotationAction">
-      <result name="success" type="ambraFreemarker">
-        <param name="location">/admin/editAnnotation.ftl</param>
-      </result>
-      <!-- stay in editAnnotation even on error -->
-      <result name="error" type="ambraFreemarker">
-        <param name="location">/admin/editAnnotation.ftl</param>
+    <action name="manageFlags" class="org.topazproject.ambra.admin.action.ManageFlagsAction">
+      <result name="success" type="ambraFreemarker">
+        <param name="location">/admin/manageFlags.ftl</param>
+      </result>
+      <!-- stay in manageFlags even on error -->
+      <result name="error" type="ambraFreemarker">
+        <param name="location">/admin/manageFlags.ftl</param>
       </result>
     </action>
 
     <!-- Process the changes made to the flags on the Manage Flags page -->
-    <action name="processFlags" class="org.topazproject.ambra.admin.action.EditAnnotationAction" method="processFlags">
-      <result name="success" type="ambraFreemarker">
-        <param name="location">/admin/editAnnotation.ftl</param>
-        <param name="noCache">true</param>
-      </result>
-      <!-- stay in editAnnotation even on error -->
-      <result name="error" type="ambraFreemarker">
-        <param name="location">/admin/editAnnotation.ftl</param>
+    <action name="processFlags" class="org.topazproject.ambra.admin.action.ManageFlagsAction" method="processFlags">
+      <result name="success" type="ambraFreemarker">
+        <param name="location">/admin/manageFlags.ftl</param>
+        <param name="noCache">true</param>
+      </result>
+      <!-- stay in manageFlags even on error -->
+      <result name="error" type="ambraFreemarker">
+        <param name="location">/admin/manageFlags.ftl</param>
         <param name="noCache">true</param>
       </result>
@@ -905 +905 @@
 
     <!-- Navigate to the Manage Annotation page without querying or showing an Annotation -->
-    <action name="editOneAnnotation" class="org.topazproject.ambra.admin.action.EditOneAnnotationAction">
-      <result name="success" type="ambraFreemarker">
-        <param name="location">/admin/editOneAnnotation.ftl</param>
-      </result>
-      <!-- stay in editOneAnnotation even on error -->
-      <result name="error" type="ambraFreemarker">
-        <param name="location">/admin/editOneAnnotation.ftl</param>
+    <action name="manageAnnotation" class="org.topazproject.ambra.admin.action.ManageAnnotationAction">
+      <result name="success" type="ambraFreemarker">
+        <param name="location">/admin/manageAnnotation.ftl</param>
+      </result>
+      <!-- stay in manageAnnotation even on error -->
+      <result name="error" type="ambraFreemarker">
+        <param name="location">/admin/manageAnnotation.ftl</param>
       </result>
     </action>
 
     <!-- Navigate to the Manage Annotation page and query/show the Annotation indicated by annotationId -->
-    <action name="editOneAnnotationLoad" class="org.topazproject.ambra.admin.action.EditOneAnnotationAction"
+    <action name="manageAnnotationLoad" class="org.topazproject.ambra.admin.action.ManageAnnotationAction"
       method="loadAnnotation">
       <result name="success" type="ambraFreemarker">
-        <param name="location">/admin/editOneAnnotation.ftl</param>
-      </result>
-      <result name="error" type="ambraFreemarker">
-        <param name="location">/admin/editOneAnnotation.ftl</param>
-      </result>
-    </action>
-
-    <action name="editOneAnnotationSave" class="org.topazproject.ambra.admin.action.EditOneAnnotationAction"
+        <param name="location">/admin/manageAnnotation.ftl</param>
+      </result>
+      <!-- stay in manageAnnotation even on error -->
+      <result name="error" type="ambraFreemarker">
+        <param name="location">/admin/manageAnnotation.ftl</param>
+      </result>
+    </action>
+
+    <action name="manageAnnotationSave" class="org.topazproject.ambra.admin.action.ManageAnnotationAction"
       method="saveAnnotation">
       <result name="success" type="ambraFreemarker">
-        <param name="location">/admin/editOneAnnotation.ftl</param>
-      </result>
-      <!-- stay in editOneAnnotation even on error -->
-      <result name="error" type="ambraFreemarker">
-        <param name="location">/admin/editOneAnnotation.ftl</param>
+        <param name="location">/admin/manageAnnotation.ftl</param>
+      </result>
+      <!-- stay in manageAnnotation even on error -->
+      <result name="error" type="ambraFreemarker">
+        <param name="location">/admin/manageAnnotation.ftl</param>
       </result>
     </action>

head/ambra/webapp/src/main/webapp/admin/manageAnnotation.ftl

@@ -21 +21 @@
   <head>
     <title>Ambra: Administration: Edit Annotation</title>
+
+    <script type="text/javascript">
+      function confirmToDeleteAuthor(authorIndex) {
+        if (confirm('Are you sure you want to delete this author?')) {
+          document.manageAnnotationSave.citationAuthorDeleteIndex.value = authorIndex;
+          document.manageAnnotationSave.submit();
+        }
+      }
+      function confirmToDeleteCollaborativeAuthor(authorIndex) {
+        if (confirm('Are you sure you want to delete this collaborative author?')) {
+          document.manageAnnotationSave.citationCollaborativeAuthorDeleteIndex.value = authorIndex;
+          document.manageAnnotationSave.submit();
+        }
+      }
+    </script>
+    
   </head>
   <body>
@@ -30 +46 @@
     <fieldset>
       <legend><b>Load Annotation</b></legend>
-      <@s.form name="editOneAnnotationLoad" action="editOneAnnotationLoad" namespace="/admin" method="post">
+      <@s.form name="manageAnnotationLoad" action="manageAnnotationLoad" namespace="/admin" method="post">
         <table>
-          <#if annotation??>
-            <tr><td><b>Annotation ID</b></td><td><@s.textfield name="annotationId" value="${annotation.id}" required="true" size="60"/></td></tr>
-          <#else>
-            <tr><td><b>Annotation ID</b></td><td><@s.textfield name="annotationId" value="" size="60"/></td></tr>
-          </#if>
+          <tr><td><b>Annotation ID</b></td><td><@s.textfield name="annotationId" value="${annotationId!}" size="60"/></td></tr>
           <tr><td colspan="2"><@s.submit value="Load Annotation" /></td></tr>
         </table>
@@ -44 +56 @@
 
   <#if annotation??>
-    <@s.form name="editOneAnnotationSave" action="editOneAnnotationSave" namespace="/admin" method="post">
-    
+    <@s.form name="manageAnnotationSave" action="manageAnnotationSave" namespace="/admin" method="post">
+
       <fieldset>
         <legend><b>Annotation Details</b></legend>
-          <@s.hidden name="annotationId" label="Id" required="true" value="${annotation.id}"/>
+          <@s.hidden name="annotationId" label="hiddenAnnotationId" required="true" value="${annotationId!}"/>
         <table>
           <tr><td><b>Title</b></td>
             <td>${annotation.title!"No Title for this Annotation"}</td></tr>
-          <tr><td><b>Content</b></td>
-            <td>${annotation.escapedComment!"No Content for this Annotation"}</td></tr>
+          <tr><td valign="top"><b>Body</b></td>
+            <td><@s.textarea name="annotationBody" value="${annotationBody!}" rows="9" cols="100"/></td></tr>
+          <tr><td><b>Context</b></td>
+            <td><@s.textarea name="annotationContext" value="${annotationContext!}" rows="3" cols="100"/></td></tr>
           <tr><td><b>Id</b></td>
-            <td><a href="${freemarker_config.context}/annotation/listThread.action?inReplyTo=${annotation.id}&root=${annotation.id}">${annotation.id}</a></td></tr>
+            <td><a href="${freemarker_config.context}/annotation/listThread.action?inReplyTo=${annotationId!}&root=${annotationId!}">${annotationId!}</a></td></tr>
           <tr><td><b>Type</b></td>
             <td>${annotation.type!"No Type"}</td></tr>
           <tr><td><b>Created</b></td>
-            <td>${annotation.created!"No Created value"}</td></tr>
+            <td>${annotation.createdAsDate?string("EEEE, MMMM dd, yyyy, hh:mm:ss a '('zzz')'")!"No Creation Date"}</td></tr>
           <tr><td><b>Creator</b></td>
-            <@s.url id="showUser" namespace="/user" action="showUser" userId="${annotation.creator}"/>
+            <@s.url id="showUser" namespace="/user" action="showUser" userId="${annotation.creator!}"/>
             <td><@s.a href="${showUser}">${annotation.creator!"No Creator"}</@s.a></td></tr>
           <tr><td><b>Annotates</b></td>
-            <td><a href="${freemarker_config.context}/article/${annotation.annotates}">${annotation.annotates!"No Annotates value"}</a></td></tr>
-          <tr><td><b>Supersedes</b></td>
-            <td>${annotation.supersedes!"No Supersedes  value"}</td></tr>
-          <tr><td><b>Superseded By</b></td>
-            <td>${annotation.supersededBy!"No Superseded By value"}</td></tr>
+            <td><a href="${freemarker_config.context}/article/${annotation.annotates!}">${annotation.annotates!"No Annotates value"}</a></td></tr>
           <tr><td><b>Conflict of Interest</b></td>
             <td>${annotation.cIStatement!"No Conflict of Interest Statement"}</td></tr>
-          <tr><td><b>Context</b></td>
-            <td><@s.textarea name="annotationContext" value="${annotationContext!annotation.context}" rows="4" cols="100"/></td></tr>
         </table>
-        <@s.submit value="Save Annotation" />
       </fieldset>
 
+    <br/>
+    <@s.submit value="Save Annotation" />
+    <br/>
+
     <#if annotation.formalCorrection || annotation.retraction>
+    <#if ! annotation.citation??>
+      <b>No Citation for this Annotation<b>
+    <#else>
+          <@s.hidden name="citationId" label="hiddenCitationId" required="true" value="${citationId!}"/>
       <fieldset>
         <legend><b>Annotation Citation</b></legend>
           <table>
-            <tr><td><b>Citation</b></td>
-              <td>${annotation.citation!"No Citation for this Annotation"}</td></tr>
+            <tr><td><b>Citation Title</b></td>
+              <td><@s.textfield name="citationTitle" value="${citationTitle!}" size="40"/></td></tr>
+            <tr><td><b>Year</b></td>
+              <td><@s.textfield name="citationDisplayYear" value="${citationDisplayYear!}" size="10"/></td></tr>
+            <tr><td><b>Volume</b></td>
+              <td><@s.textfield name="citationVolumeNumber" value="${citationVolumeNumber!}" size="10"/></td></tr>
+            <tr><td><b>Issue</b></td>
+              <td><@s.textfield name="citationIssue" value="${citationIssue!}" size="10"/></td></tr>
+            <tr><td><b>Journal</b></td>
+              <td><@s.textfield name="citationJournal" value="${citationJournal!}" size="20"/></td></tr>
+            <tr><td><b>eLocationId</b></td>
+              <td><@s.textfield name="citationELocationId" value="${citationELocationId!}" size="40"/></td></tr>
+            <tr><td><b>DOI</b></td>
+              <td><@s.textfield name="citationDoi" value="${citationDoi!}" size="40"/></td></tr>
+            <tr><td><b>URL</b></td>
+              <td>${annotation.citation.url!"No URL"}</td></tr>
+            <tr><td><b>Note</b></td>
+              <td>${annotation.citation.note!"No Note"}</td></tr>
+            <tr><td><b>Summary</b></td>
+              <td>${annotation.citation.summary!"No Summary"}</td></tr>
+            <tr><td colspan="2">
+              <fieldset>
+                <legend><b>Citation Authors</b></legend>
+                  <table>
+                    <#if citationAuthorIds?? && (citationAuthorIds?size > 0)>
+                        <tr><td><b>Given Names</b></td><td><b>Surnames</b></td><td><b>Suffixes</b></td></tr>
+                        <@s.hidden name="citationAuthorDeleteIndex" label="citationAuthorDeleteIndex" required="true" value="-1"/>
+                      <#list citationAuthorIds as authorId>
+                        <@s.hidden name="citationAuthorIds" label="hiddenCitationAuthorIds" required="true" value="${authorId!}"/>
+                        <tr><td><@s.textfield name="citationAuthorGivenNames" value="${citationAuthorGivenNames[authorId_index]!}" size="20"/></td>
+                          <td><@s.textfield name="citationAuthorSurnames" value="${citationAuthorSurnames[authorId_index]!}" size="20"/></td>
+                          <td><@s.textfield name="citationAuthorSuffixes" value="${citationAuthorSuffixes[authorId_index]!}" size="20"/></td>
+                          <td><a href="#" onClick="confirmToDeleteAuthor(${authorId_index});return false;">Delete Author</a></td></tr>
+                      </#list>
+                        <tr><td><@s.textfield name="citationAuthorGivenNames" value="" size="20"/></td>
+                          <td><@s.textfield name="citationAuthorSurnames" value="" size="20"/></td>
+                          <td><@s.textfield name="citationAuthorSuffixes" value="" size="20"/></td>
+                          <td><a href="#" onClick="document.manageAnnotationSave.submit()">Add Author</a></td></tr>
+                    <#else>
+                      There are currently no Authors associated to this Citation.
+                      <@s.hidden name="citationAuthorDeleteIndex" label="citationAuthorDeleteIndex" required="true" value="-1"/>
+                      <tr><td><@s.textfield name="citationAuthorGivenNames" value="" size="20"/></td>
+                        <td><@s.textfield name="citationAuthorSurnames" value="" size="20"/></td>
+                        <td><@s.textfield name="citationAuthorSuffixes" value="" size="20"/></td>
+                        <td><a href="#" onClick="document.manageAnnotationSave.submit()">Add Author</a></td></tr>
+                    </#if>
+                </table>
+              </fieldset>
+            </td></tr>
+
+            <tr><td colspan="2">
+              <fieldset>
+                <legend><b>Citation Collaborative Authors</b></legend>
+                <table>
+                    <#if citationCollaborativeAuthorNames?? && (citationCollaborativeAuthorNames?size > 0)>
+                        <@s.hidden name="citationCollaborativeAuthorDeleteIndex" label="citationCollaborativeAuthorDeleteIndex" required="true" value="-1"/>
+                      <#list citationCollaborativeAuthorNames as authorName>
+                        <tr><td><@s.textfield name="citationCollaborativeAuthorNames" value="${authorName!}" size="20"/></td>
+                          <td><a href="#" onClick="confirmToDeleteCollaborativeAuthor(${authorName_index});return false;">Delete Collaborative Author</a></td></tr>
+                      </#list>
+                        <tr><td><@s.textfield name="citationCollaborativeAuthorNames" value="" size="20"/></td>
+                          <td><a href="#" onClick="document.manageAnnotationSave.submit()">Add Collaborative Author</a></td></tr>
+                    <#else>
+                      There are currently no Collaborative Authors associated to this Citation.
+                        <@s.hidden name="citationCollaborativeAuthorDeleteIndex" label="citationCollaborativeAuthorDeleteIndex" required="true" value="-1"/>
+                        <tr><td><@s.textfield name="citationCollaborativeAuthorNames" value="" size="20"/></td>
+                          <td><a href="#" onClick="document.manageAnnotationSave.submit()">Add Collaborative Author</a></td></tr>
+                    </#if>
+                </table>
+              </fieldset>
+            </td></tr>
+
           </table>
-          <@s.submit value="Save Annotation" />
       </fieldset>
+      <@s.submit value="Save Annotation" />
     </#if>
-
+    </#if>
     </@s.form>
   </#if>

head/ambra/webapp/src/main/webapp/admin/manageFlags.ftl

@@ -30 +30 @@
       <fieldset>
         <legend><b>Flagged Comments</b></legend>
-        <@s.form name="editAnnotationAction" action="processFlags" method="post" namespace="/admin">
+        <@s.form name="manageFlagsAction" action="processFlags" method="post" namespace="/admin">
           <table width="100%">
             <tr><td><b>Time</b></td><td><b>Comment</b></td><td><b>By</b></td><td><b>Refers To</b></td><td><b>Reason</b></td><td><b>Action</b></td></tr>
@@ -36 +36 @@
             <#list flaggedComments as flaggedComment>
               <#if flaggedComment.isAnnotation>
-                <@s.url id="flagURL" namespace="/admin" action="editOneAnnotationLoad" annotationId="${flaggedComment.target}"/>
+                <@s.url id="flagURL" namespace="/admin" action="manageAnnotationLoad" annotationId="${flaggedComment.target}"/>
                 <#if flaggedComment.correction>
                   <#assign deleteLabel = "Delete Correction">

head/ambra/webapp/src/main/webapp/admin/templates/standardHeader.ftl

@@ -19 +19 @@
 -->
 <@s.url id="adminTop" namespace="/admin" action="adminTop"/>
-<@s.url id="editAnnotation" namespace="/admin" action="editAnnotation"/>
-<@s.url id="editOneAnnotation" namespace="/admin" action="editOneAnnotation"/>
+<@s.url id="manageFlags" namespace="/admin" action="manageFlags"/>
+<@s.url id="manageAnnotation" namespace="/admin" action="manageAnnotation"/>
 <@s.url id="manageUsersURL" namespace="/admin" action="findUser" />
 <@s.url id="manageVirtualJournalsURL" namespace="/admin" action="manageVirtualJournals" />
@@ -27 +27 @@
 <p style="text-align: right">
   <@s.a href="${adminTop}">Admin Top</@s.a>&nbsp;|&nbsp;
-  <@s.a href="${editAnnotation}">Manage Flags</@s.a>&nbsp;|&nbsp;
-  <@s.a href="${editOneAnnotation}">Manage Annotations</@s.a>&nbsp;|&nbsp;
+  <@s.a href="${manageFlags}">Manage Flags</@s.a>&nbsp;|&nbsp;
+  <@s.a href="${manageAnnotation}">Manage Annotations</@s.a>&nbsp;|&nbsp;
   <@s.a href="${manageUsersURL}">Manage Users</@s.a>&nbsp;|&nbsp;
   <@s.a href="${manageVirtualJournalsURL}">Manage Virtual Journals</@s.a>&nbsp;|&nbsp;

head/ambra/webapp/src/test/java/org/topazproject/ambra/admin/action/ProcessFlagsActionTest.java

@@ -149 +149 @@
     annotationService.setPermissionsService(permissionsService);
     annotationService.setAnnotationsPdp(pdp);
-    EditAnnotationAction action = new EditAnnotationAction();
+    ManageFlagsAction action = new ManageFlagsAction();
     action.setAnnotationService(annotationService);
     action.setAdminService(adminService);