Merge pull request #151 from pwgit-create/develop

Develop

Author: pwgit-create

cg/CodeGenerator/CodeGenerator/src/main/java/pn/cg/util/StringUtil.java

@@ -152,9 +152,11 @@ private static String removeDelimiters(String input, boolean isStartDelimiter) {
             if (isStartDelimiter) {
                 delimiter = CommonStringConstants.JAVA_CODE_GENERATION_START_DELMITER_STRING;
                 returnValue = RemoveAllExceptTheFirstOccurrenceOfaAWord(returnValue, delimiter);
+                returnValue = RemoveAllExceptTheFirstOccurrenceOfaAWord(returnValue,delimiter + "\n");
             } else if (!isStartDelimiter) {
                 delimiter = CommonStringConstants.JAVA_CODE_GENERATION_END_DELMITER_STRING;
                 returnValue = RemoveAllExceptTheLastOccurrenceOfWord(returnValue, delimiter);
+                returnValue = RemoveAllExceptTheLastOccurrenceOfWord(returnValue,delimiter+"\n");
             }
         } catch (Exception e) {
             log.debug("Error on delimiter String removal process");