commit e3175d3adc6bb5593d6d1fa9344f256923c1ae1b
author Bharat saraswal <bharat.saraswal@huawei.com> Wed Aug 31 17:50:11 2016 +0530
committer Bharat saraswal <bharat.saraswal@huawei.com> Wed Aug 31 17:50:11 2016 +0530
tree ad6d5071ba595cea8c98b7fc7df03934b05a08ec
parent 61edaa049e91b546b8eaa638eaf767edd40a5c5d

[ONOS-5141],[ONOS-5142],[ONOS-5165],[ONOS-4881],[ONOS-4889],[ONOS-5104],[ONOS-5138] defect fixes

Change-Id: I435dc0cf9afae7230fc98b57f33af104e0e38e67

plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java

diff --git a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java
index 8a578c3..6ac0581 100644
--- a/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java
+++ b/plugin/src/main/java/org/onosproject/yangutils/utils/io/impl/YangIoUtils.java
@@ -43,6 +43,7 @@
 import static org.onosproject.yangutils.utils.UtilConstants.JAVA_KEY_WORDS;
 import static org.onosproject.yangutils.utils.UtilConstants.NEW_LINE;
 import static org.onosproject.yangutils.utils.UtilConstants.ONE;
+import static org.onosproject.yangutils.utils.UtilConstants.OPEN_CURLY_BRACKET;
 import static org.onosproject.yangutils.utils.UtilConstants.OPEN_PARENTHESIS;
 import static org.onosproject.yangutils.utils.UtilConstants.ORG;
 import static org.onosproject.yangutils.utils.UtilConstants.PACKAGE;
@@ -77,8 +78,8 @@
  */
 public final class YangIoUtils {
 
-    private static final int LINE_SIZE = 116;
-    private static final int SUB_LINE_SIZE = 114;
+    private static final int LINE_SIZE = 118;
+    private static final int SUB_LINE_SIZE = 116;
     private static final int ZERO = 0;
 
     /**
@@ -311,7 +312,7 @@
         try {
             appendFileContents(appendFile, srcFile);
         } catch (IOException e) {
-            throw new IOException("Failed to append " + appendFile + " in " + srcFile);
+            throw new IOException("Failed to merge " + appendFile + " in " + srcFile);
         }
     }
 
@@ -437,8 +438,31 @@
         StringBuilder tempBuilder = new StringBuilder();
         String append;
         for (String str : strArray) {
-            append = str + string;
-            tempBuilder.append(append);
+            if (strArray[strArray.length - 1].contains(OPEN_CURLY_BRACKET)) {
+                if (str.equals(strArray[strArray.length - 2])
+                        && !str.equals(strArray[0])
+                        && tempBuilder.length() < SUB_LINE_SIZE) {
+                    String tempString = stringBuilder.toString();
+                    stringBuilder.delete(ZERO, stringBuilder.length());
+                    tempString = trimAtLast(tempString, string);
+                    stringBuilder.append(tempString);
+                    if (string.equals(PERIOD)) {
+                        append = NEW_LINE + TWELVE_SPACE_INDENTATION + PERIOD + str + string;
+                    } else {
+                        append = NEW_LINE + TWELVE_SPACE_INDENTATION + str + string;
+                    }
+                    stringBuilder.append(append);
+                    append = EMPTY_STRING;
+                    tempBuilder.delete(ZERO, tempBuilder.length());
+                    tempBuilder.append(TWELVE_SPACE_INDENTATION);
+                } else {
+                    append = str + string;
+                    tempBuilder.append(append);
+                }
+            } else {
+                append = str + string;
+                tempBuilder.append(append);
+            }
             if (tempBuilder.length() > lineSize) {
                 String tempString = stringBuilder.toString();
                 stringBuilder.delete(ZERO, stringBuilder.length());