Fix CR problems

Author: DunaMariusCosmin

README.md

@@ -21,7 +21,7 @@ The following options can be set for DITA topics or maps (or both):
 
 - **Author**: Specifies the name of the author. By default, it is the system user name.
 - **Enable automatic prolog update on save**: When this option is selected, the prolog is updated anytime the document is saved.
-- **Set the creator name**: When this option is selected, the author is set as the document's *creator* in the prolog when the document is saved. This option is only applicable for new documents.
-- **Set the created date**: When this option is selected, a *created date* is added to the prolog when the document is saved. This option is only applicable for new documents.
-- **Update the contributor names**: When this option is selected, the author is set as a *contributor* in the prolog when the document is saved. This option is only applicable for already existing documents.
-- **Update the revised dates**: When this option is selected, a *revised date* is added to the prolog when the document is saved. This option is only applicable for already existing documents. 
+- **Set creator name**: When this option is selected, the author is set as the document's *creator* in the prolog when the document is saved. This option is only applicable for new documents.
+- **Set created date**: When this option is selected, a *created date* is added to the prolog when the document is saved. This option is only applicable for new documents.
+- **Update contributor names**: When this option is selected, the author is set as a *contributor* in the prolog when the document is saved. This option is only applicable for already existing documents.
+- **Update revised dates**: When this option is selected, a *revised date* is added to the prolog when the document is saved. This option is only applicable for already existing documents. 

i18n/translation.xml

@@ -44,35 +44,35 @@
 	</key>
 	<key value="prolog.updater.set.creator">
 		<comment>The text from the check box which set the creator</comment>
-		<val lang="en_US">Set the creator name</val>
-		<val lang="de_DE">Set the creator name</val>
-		<val lang="fr_FR">Set the creator name</val>
-		<val lang="ja_JP">Set the creator name</val>
-		<val lang="nl_NL">Set the creator name</val>
+		<val lang="en_US">Set creator name</val>
+		<val lang="de_DE">Set creator name</val>
+		<val lang="fr_FR">Set creator name</val>
+		<val lang="ja_JP">Set creator name</val>
+		<val lang="nl_NL">Set creator name</val>
 	</key>
 	<key value="prolog.updater.set.created.date">
 		<comment>The text from the check box which set the created date</comment>
-		<val lang="en_US">Set the created date</val>
-		<val lang="de_DE">Set the created date</val>
-		<val lang="fr_FR">Set the created date</val>
-		<val lang="ja_JP">Set the created date</val>
-		<val lang="nl_NL">Set the created date</val>
+		<val lang="en_US">Set created date</val>
+		<val lang="de_DE">Set created date</val>
+		<val lang="fr_FR">Set created date</val>
+		<val lang="ja_JP">Set created date</val>
+		<val lang="nl_NL">Set created date</val>
 	</key>
 	<key value="prolog.updater.update.contributor">
 		<comment>The text from the check box which set the contributor</comment>
-		<val lang="en_US">Update the contributor names</val>
-		<val lang="de_DE">Update the contributor names</val>
-		<val lang="fr_FR">Update the contributor names</val>
-		<val lang="ja_JP">Update the contributor names</val>
-		<val lang="nl_NL">Update the contributor names</val>
+		<val lang="en_US">Update contributor names</val>
+		<val lang="de_DE">Update contributor names</val>
+		<val lang="fr_FR">Update contributor names</val>
+		<val lang="ja_JP">Update contributor names</val>
+		<val lang="nl_NL">Update contributor names</val>
 	</key>
 	<key value="prolog.updater.update.revised.dates">
 		<comment>The text from the check box which set the revised date</comment>
-		<val lang="en_US">Update the revised dates</val>
-		<val lang="de_DE">Update the revised dates</val>
-		<val lang="fr_FR">Update the revised dates</val>
-		<val lang="ja_JP">Update the revised dates</val>
-		<val lang="nl_NL">Update the revised dates</val>
+		<val lang="en_US">Update revised dates</val>
+		<val lang="de_DE">Update revised dates</val>
+		<val lang="fr_FR">Update revised dates</val>
+		<val lang="ja_JP">Update revised dates</val>
+		<val lang="nl_NL">Update revised dates</val>
 	</key>
 
 	<key value="prolog.updater.error.message">

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

@@ -35,7 +35,7 @@ public class DitaTopicTextEditor implements DitaEditor {
 	/**
 	 * Text document controller
 	 */
-	TextDocumentController documentController;
+	private TextDocumentController documentController;
 
 	/**
 	 * The page from Workspace text editor.

src/main/java/com/oxygenxml/prolog/updater/prolog/content/PrologContentCreator.java

@@ -21,6 +21,11 @@
  */
 public class PrologContentCreator {
 
+	/**
+	 * Date pattern.
+	 */
+	public static final String DATE_PATTERN = "yyyy/MM/dd";
+	
 	/**
 	 * XML fragment for author that has type creator.
 	 */
@@ -45,6 +50,7 @@ public class PrologContentCreator {
 	 * The local date in format "yyyy/MM/dd".
 	 */
 	private String localDate;
+	
 	/**
 	 * The name of the author
 	 */
@@ -304,7 +310,7 @@ public String getDateFragment(boolean isNewDocument, DocumentType documentType)
 	 * @return The local date in String format.
 	 */
 	protected String createLocalDate() {
-		return new SimpleDateFormat(XMLFragmentUtils.DATE_PATTERN).format(new Date());
+		return new SimpleDateFormat(DATE_PATTERN).format(new Date());
 	}
 
 	/**

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

@@ -36,22 +36,22 @@ private Tags() {
 	public static final String ENABLE_UPDATE_ON_SAVE = "prolog.updater.enable.on.save";
 
 	/**
-	 * en: Set the creator name
+	 * en: Set creator name
 	 */
 	public static final String SET_CREATOR = "prolog.updater.set.creator";
 
 	/**
-	 * en: Set the created date
+	 * en: Set created date
 	 */
 	public static final String SET_CREATED_DATE = "prolog.updater.set.created.date";
 
 	/**
-	 * en: Update the contributor names
+	 * en: Update contributor names
 	 */
 	public static final String UPDATE_CONTRIBUTOR = "prolog.updater.update.contributor";
 
 	/**
-	 * en: Update the revised dates
+	 * en: Update revised dates
 	 */
 	public static final String UPDATE_REVISED_DATES = "prolog.updater.update.revised.dates";
 

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

@@ -170,9 +170,7 @@ public static void insertFragmentSchemaAware(final WSEditorPage page, final Auth
 			}
 
 			try {
-				if (caretOffset != -1) {
-					position = controller.createPositionInContent(caretOffset);
-				}
+				position = controller.createPositionInContent(caretOffset);
 			} catch (BadLocationException e) {
 				logger.debug(e.getMessage(), e);
 			}
@@ -220,16 +218,16 @@ public static void insertFragmentSchemaAware(final WSEditorPage page,
 			if (page instanceof WSAuthorEditorPage) {
 				caretOffset = ((WSAuthorEditorPage) page).getCaretOffset();
 			}
-			if (caretOffset != -1) {
-				try {
-					pos = documentController.createPositionInContent(caretOffset);
-				} catch (BadLocationException e) {
-					logger.debug(e.getMessage(), e);
-				}
+			try {
+				pos = documentController.createPositionInContent(caretOffset);
+			} catch (BadLocationException e) {
+				logger.debug(e.getMessage(), e);
 			}
 
+			// Insert the fragment.
 			documentController.insertXMLFragmentSchemaAware(xmlFragment, xPath, position);
 
+			// Restore the caret position.
 			if (pos != null) {
 				((WSAuthorEditorPage) page).setCaretPosition(pos.getOffset());
 			}

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

@@ -112,7 +112,7 @@ private static String prettyPrintFragment(WSXMLTextEditorPage wsTextEditorPage,
 					// Pretty print moves to next line. We don't want that.
 					if (fragment.endsWith("\r\n")) {
 						fragment = fragment.substring(0, fragment.length() - 2);
-					} else if (fragment.endsWith("\n") || fragment.endsWith("\r\n") || fragment.endsWith("\r")) {
+					} else if (fragment.endsWith("\n") || fragment.endsWith("\r")) {
 						fragment = fragment.substring(0, fragment.length() - 1);
 					}
 				} catch (PrettyPrintException e) {

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

@@ -6,10 +6,6 @@
  * @author adrian_sorop
  */
 public class XMLFragmentUtils {
-	/**
-	 * Date pattern.
-	 */
-	public static final String DATE_PATTERN = "yyyy/MM/dd";
 
 	/**
 	 * Private constructor. Avoid instantiation.
@@ -25,15 +21,14 @@ private XMLFragmentUtils() {
 	 * @return The critdates element with the date.
 	 */
 	public static String createCritdateTag(String date) {
-		if (date == null) {
-			return null;
-		} else {
+		if (date != null) {
 			StringBuilder sb = new StringBuilder();
 			sb.append("<critdates>");
 			sb.append(date);
 			sb.append("</critdates>");
 			return sb.toString();
 		}
+		return null;
 	}
 
 	/**