#21, EXM-47281: Don't allow adding original author as additional one.

Author: DunaMariusCosmin

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

@@ -8,6 +8,7 @@
 import org.apache.log4j.Logger;
 
 import com.oxygenxml.prolog.updater.prolog.content.PrologContentCreator;
+import com.oxygenxml.prolog.updater.tags.OptionKeys;
 import com.oxygenxml.prolog.updater.utils.AuthorPageDocumentUtil;
 import com.oxygenxml.prolog.updater.utils.ElementXPathUtils;
 import com.oxygenxml.prolog.updater.utils.XMLFragmentUtils;
@@ -20,9 +21,12 @@
 import ro.sync.ecss.extensions.api.node.AttrValue;
 import ro.sync.ecss.extensions.api.node.AuthorElement;
 import ro.sync.ecss.extensions.api.node.AuthorNode;
+import ro.sync.exml.workspace.api.PluginWorkspace;
+import ro.sync.exml.workspace.api.PluginWorkspaceProvider;
 import ro.sync.exml.workspace.api.editor.page.WSEditorPage;
 import ro.sync.exml.workspace.api.editor.page.author.WSAuthorEditorPage;
 import ro.sync.exml.workspace.api.editor.page.ditamap.WSDITAMapEditorPage;
+import ro.sync.exml.workspace.api.options.WSOptionsStorage;
 
 /**
  * Edit DITA topic in author mode.
@@ -415,10 +419,11 @@ private void updateAuthorElements(AuthorElement prolog, boolean isNewDocument) t
 		    fragment = prologCreator.getCreatorFragment(documentType);
 		  }
 		} else {
-		  if (!AuthorPageDocumentUtil.hasContributor(
-		      existentAuthorsElements,
-		      prologCreator.getContributorTypeValue(),
-		      prologCreator.getAuthor())) {
+		  if ( ! AuthorPageDocumentUtil.hasCreator(
+		      existentAuthorsElements, prologCreator.getCreatorTypeValue())
+		      &&
+		      ! AuthorPageDocumentUtil.hasContributor(
+		      existentAuthorsElements, prologCreator.getContributorTypeValue(), prologCreator.getAuthor())) {
 		    // if wasn't found this contributor
 		    fragment = prologCreator.getContributorFragment(documentType);
 		    int nuOfAuthors = existentAuthorsElements.size();

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

@@ -370,20 +370,26 @@ private void addAuthor(boolean isNewDocument) throws TextOperationException {
 	 */
 	private void editAuthor(boolean isNewDocument) throws XPathException, TextOperationException {
 	  // prolog contains author elements
-	  String xpath;
-	  String fragment;
+	  String fragment = null;
+	  Object[] creatorElement = wsTextEditorPage.evaluateXPath(
+	      ElementXPathUtils.getAuthorCreatorXpath(documentType));
 	  if (isNewDocument) {
 	    // The document isn't new. We should work with creators
-	    xpath = ElementXPathUtils.getAuthorCreatorXpath(documentType);
-	    fragment = prologCreator.getCreatorFragment(documentType);
+	    if (creatorElement.length == 0) {
+	      fragment = prologCreator.getCreatorFragment(documentType);
+	    }
 	  } else {
 	    // The document isn't new. We should work with contributors
-	    xpath = ElementXPathUtils.getAuthorContributorXpath(documentType, prologCreator.getAuthor());
-	    fragment = prologCreator.getContributorFragment(documentType);
+	    if (creatorElement.length == 0) {
+	      Object[] contributorElement = wsTextEditorPage.evaluateXPath(
+	          ElementXPathUtils.getAuthorContributorXpath(documentType, prologCreator.getAuthor()));
+	      if(contributorElement.length == 0) {
+	        fragment = prologCreator.getContributorFragment(documentType);
+	      }
+	    } 
 	  }
 
-	  Object[] authorElements = wsTextEditorPage.evaluateXPath(xpath);
-	  if (authorElements.length == 0) {
+	  if (fragment != null) {
 	    // there aren't creator/contributor author elements in prolog
 	    TextPageDocumentUtil.insertXmlFragment(wsTextEditorPage, fragment,
 	        ElementXPathUtils.getLastAuthorXpath(documentType), RelativeInsertPosition.INSERT_LOCATION_AFTER);

src/main/java/com/oxygenxml/prolog/updater/tags/OptionKeys.java

@@ -92,9 +92,4 @@ private OptionKeys() {
 	 * Option to set the revised dates in prolog for maps.
 	 */
 	public static final String MAP_UPDATE_REVISED_DATES = "prolog.updater.update.revised.dates.map";
-	
-	 /**
-   * Option to allow adding of original author as additional one.
-   */
-  public static final String ALLOW_ADDING_ORIGINAL_AUTHOR_AS_ADDITIONAL = "allow.adding.original.author.as.additional";
 }

src/test/java/com/oxygenxml/prolog/updater/DitaMapUpdaterAuthorTest.java

@@ -60,7 +60,6 @@ public void testUpdateAuthorInProlog() throws IOException, SAXException, BadLoca
 		String expectedOldXmlWithCreator = "<?xml version=\"1.0\" encoding=\"utf-8\"?><map>" + 
 				"    <topicmeta >" + 
 				"        <author type=\"creator\" >"+AuthorTestCase.AUTHOR_NAME+"</author>" + 
-				"        <author type=\"contributor\" >"+AuthorTestCase.AUTHOR_NAME+"</author>" + 
 				"        <critdates>" + 
 				"           <!--"+AuthorTestCase.AUTHOR_NAME+"-->" + 
 				"            <revised modified=\""+localDate+"\" />" + 

src/test/java/com/oxygenxml/prolog/updater/DitaTopicUpdaterAuthorTest.java

@@ -66,7 +66,6 @@ public void testUpdateAuthorInProlog() throws IOException, SAXException, BadLoca
 				"    <title > </title>" + 
 				"    <prolog >" + 
 				"        <author type=\"creator\" >"+AuthorTestCase.AUTHOR_NAME+"</author>" + 
-				"        <author type=\"contributor\" >"+AuthorTestCase.AUTHOR_NAME+"</author>" + 
 				"        <critdates>" + 
 				"           <!--"+AuthorTestCase.AUTHOR_NAME+"-->" + 
 				"            <revised modified=\""+localDate+"\" />" +