EXM-47281: Also check the name of the creator when adding a contributor.

Author: DunaMariusCosmin

src/main/java/com/oxygenxml/prolog/updater/dita/editor/DitaTopicAuthorEditor.java

@@ -415,10 +415,10 @@ private void updateAuthorElements(AuthorElement prolog, boolean isNewDocument) t
 		    fragment = prologCreator.getCreatorFragment(documentType);
 		  }
 		} else {
-		  if ( ! AuthorPageDocumentUtil.hasCreator(
-		      existentAuthorsElements, prologCreator.getCreatorTypeValue())
+		  if ( ! AuthorPageDocumentUtil.hasAuthorWithTypeAndName(
+		      existentAuthorsElements, prologCreator.getCreatorTypeValue(), prologCreator.getAuthor())
 		      &&
-		      ! AuthorPageDocumentUtil.hasContributor(
+		      ! AuthorPageDocumentUtil.hasAuthorWithTypeAndName(
 		      existentAuthorsElements, prologCreator.getContributorTypeValue(), prologCreator.getAuthor())) {
 		    // if wasn't found this contributor
 		    fragment = prologCreator.getContributorFragment(documentType);

src/main/java/com/oxygenxml/prolog/updater/dita/editor/DitaTopicTextEditor.java

@@ -371,18 +371,23 @@ private void addAuthor(boolean isNewDocument) throws TextOperationException {
 	private void editAuthor(boolean isNewDocument) throws XPathException, TextOperationException {
 	  // prolog contains author elements
 	  String fragment = null;
-	  Object[] creatorElement = wsTextEditorPage.evaluateXPath(
-	      ElementXPathUtils.getAuthorCreatorXpath(documentType));
 	  if (isNewDocument) {
+	    Object[] creatorElement = wsTextEditorPage.evaluateXPath(
+	        ElementXPathUtils.getAuthorXpathByTypeAndName(
+              documentType, prologCreator.getCreatorTypeValue(), null));
 	    // The document isn't new. We should work with creators
 	    if (creatorElement.length == 0) {
 	      fragment = prologCreator.getCreatorFragment(documentType);
 	    }
 	  } else {
 	    // The document isn't new. We should work with contributors
+	    Object[] creatorElement = wsTextEditorPage.evaluateXPath(
+          ElementXPathUtils.getAuthorXpathByTypeAndName(
+              documentType, prologCreator.getCreatorTypeValue(), prologCreator.getAuthor()));
 	    if (creatorElement.length == 0) {
 	      Object[] contributorElement = wsTextEditorPage.evaluateXPath(
-	          ElementXPathUtils.getAuthorContributorXpath(documentType, prologCreator.getAuthor()));
+	          ElementXPathUtils.getAuthorXpathByTypeAndName(
+	              documentType, prologCreator.getContributorTypeValue(), prologCreator.getAuthor()));
 	      if(contributorElement.length == 0) {
 	        fragment = prologCreator.getContributorFragment(documentType);
 	      }

src/main/java/com/oxygenxml/prolog/updater/utils/AuthorPageDocumentUtil.java

@@ -120,22 +120,22 @@ public static boolean hasCreator(List<AuthorElement> authors, String creatorType
 
 
 	/**
-	 * Search for contributor author with the given name
+	 * Search for author with the type attribute and the given name
 	 * 
 	 * @param authors              The list with authors.
-	 * @param contributorTypeValue The value of type attribute for a contributor.
+	 * @param attributeType        The value of type attribute.
 	 * @param authorName           The name of the author.
 	 * 
 	 * @return <code>true</code> if was found an author with given type.
 	 */
-	public static boolean hasContributor(List<AuthorElement> authors, String contributorTypeValue, String authorName) {
+	public static boolean hasAuthorWithTypeAndName(List<AuthorElement> authors, String attributeType, String authorName) {
 		boolean foundContributor = false;
 
 		// Iterate over authors.
 		for (AuthorElement el : authors) {
 			// Get the type's value,
 			AttrValue typeAttr = el.getAttribute("type");
-			if (typeAttr != null && contributorTypeValue.equals(typeAttr.getValue())) {
+			if (typeAttr != null && attributeType.equals(typeAttr.getValue())) {
 			  try {
 			    // Check the content of contributor element.
 			    String textContent = el.getTextContent();

src/main/java/com/oxygenxml/prolog/updater/utils/ElementXPathUtils.java

@@ -132,50 +132,46 @@ private static String getAuthorCreatorXPathInternal(String prologTypeXpath) {
   }
 
   /**
-   * Get the XPath of the contributor element with the given author name.
+   * Get the XPath of the author element with the given type attribute and the given author name.
    * 
    * @param documentType
    *          The document type( {@link DocumentType#TOPIC},
    *          {@link DocumentType#MAP}, {@link DocumentType#BOOKMAP} 
    *          or {@link DocumentType#SUBJECT_SCHEME} ).
+   * @param authorType The type attribute of the author.
    * @param authorName The name of the author.         
    *        
-   * @return The XPath of last the creator element.
+   * @return The XPath of the author element with the given type attribute and the given author name.
    */
-  public static String getAuthorContributorXpath(DocumentType documentType, String authorName) {
+  public static String getAuthorXpathByTypeAndName(DocumentType documentType, String authorType, String authorName) {
     return documentType.equals(DocumentType.TOPIC) 
-        ? getAuthorContributorXPathInternal(ElementXPathConstants.PROLOG_XPATH, authorName)
-        : getAuthorContributorXPathInternal(ElementXPathConstants.TOPICMETA_XPATH, authorName);
+        ? getAuthorXpathByTypeAndNameInternal(ElementXPathConstants.PROLOG_XPATH, authorType, authorName)
+        : getAuthorXpathByTypeAndNameInternal(ElementXPathConstants.TOPICMETA_XPATH, authorType, authorName);
   }
 
   /**
-   * Get the xpath for retrieving the contributor elements with the given author name.
+   * Get the XPath of the author element with the given type attribute and the given author name.
    * 
    * @param prologTypeXpath The xpath to prolog/topicmeta element.
-   * @param authorName The name of the author.   
-   * 
-   * @return The xpath for retrieving all contributor elements with the given author name.
+   * @param authorType The type attribute of the author.
+   * @param authorName The name of the author.         
+   *        
+   * @return The XPath of the author element with the given type attribute and the given author name.
    */
-  private static String getAuthorContributorXPathInternal(String prologTypeXpath, String authorName) {
+  private static String getAuthorXpathByTypeAndNameInternal(String prologTypeXpath, String authorType, String authorName) {
     StringBuilder xpath = new StringBuilder();
     xpath.append(prologTypeXpath);
-    xpath.append("/author[@type='");
-    
-    String creatorTypeValue = XmlElementsConstants.CONTRIBUTOR_TYPE;
-    PluginWorkspace pluginWorkspace = PluginWorkspaceProvider.getPluginWorkspace();
-    if (pluginWorkspace != null) {
-      WSOptionsStorage optionsStorage = pluginWorkspace.getOptionsStorage();
-      String valueFromOptions = optionsStorage.getOption(OptionKeys.CUSTOM_CONTRIBUTOR_TYPE_VALUE, "");
-      if (!valueFromOptions.isEmpty()) {
-        creatorTypeValue = valueFromOptions;
-      }
+    xpath.append("/author");
+    if(authorType != null) {
+      xpath.append("[@type='");
+      xpath.append(authorType).append("']");
+    }
+    if(authorName != null) {
+      xpath.append("[text()= '").append(authorName).append("']");
     }
-    xpath.append(creatorTypeValue);
-    xpath.append("' and text()= '").append(authorName).append("']");
-
     return xpath.toString();
   }
-
+  
 	/**
 	 * Get the XPath of the critdates element.
 	 *