Yang code generator cleanup

[controller.git] / opendaylight / config / yang-jmx-generator-plugin / src / main / java / org / opendaylight / controller / config / yangjmxgenerator / plugin / util / StringUtil.java

diff --git a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/StringUtil.java b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/StringUtil.java
index 0b833f01b9cb401468cefed184a324c96a1516cd..02ab91b817cb20bda841c4cc671076d41cba49da 100644 (file)
--- a/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/StringUtil.java
+++ b/opendaylight/config/yang-jmx-generator-plugin/src/main/java/org/opendaylight/controller/config/yangjmxgenerator/plugin/util/StringUtil.java
@@ -85,14 +85,14 @@ public class StringUtil {
 
         int basicIndent = 4;
         StringBuilder sb = new StringBuilder();
 
         int basicIndent = 4;
         StringBuilder sb = new StringBuilder();

-        int intends = 0, empty = 0;
+        int indents = 0, empty = 0;

         for (String line : split) {
         for (String line : split) {

-            intends -= StringUtils.countMatches(line, "}");
-            if (intends < 0) {
-                intends = 0;
+            indents -= StringUtils.countMatches(line, "}");
+            if (indents < 0) {
+                indents = 0;

             }
             }

-            if (line.isEmpty() == false) {
-                sb.append(Strings.repeat(" ", basicIndent * intends));
+            if (!line.isEmpty()) {
+                sb.append(Strings.repeat(" ", basicIndent * indents));

                 sb.append(line);
                 sb.append("\n");
                 empty = 0;
                 sb.append(line);
                 sb.append("\n");
                 empty = 0;


@@ -102,7 +102,7 @@ public class StringUtil {
                     sb.append("\n");
                 }
             }
                     sb.append("\n");
                 }
             }

-            intends += StringUtils.countMatches(line, "{");
+            indents += StringUtils.countMatches(line, "{");

         }
         return ensureEndsWithSingleNewLine(sb.toString());
     }
         }
         return ensureEndsWithSingleNewLine(sb.toString());
     }