Merge "fix critical sonar"

diff --combined misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
index c651d75,1017625..4bb6ee2
--- 1/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
--- 2/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
+++ b/misc/xgen/src/main/java/org/onap/aaf/misc/xgen/XGen.java
@@@ -30,7 -30,7 +30,7 @@@ import org.onap.aaf.misc.env.util.Strin
  \r
  public class XGen<RT extends XGen<RT>> {\r
  \r
 -      public static int COMMENT_COLUMN = 40;\r
 +      private static final int COMMENT_COLUMN = 40;\r
        private StringBuilder backSB = new StringBuilder();\r
        private Stack<Back> backStack = new Stack<Back>();\r
        \r
@@@ -112,7 -112,7 +112,7 @@@
        \r
                if(pretty) {\r
                        if(mark!=null && mark.comment!=null) {\r
-                               int fi = forward.getIndent()*IndentPrintWriter.INDENT;\r
+                               int fi = forward.getIndent()*IndentPrintWriter.INDENT_MULTIPLIER;\r
                                for(int i = fi+backSB.length();i<=COMMENT_COLUMN;++i) {\r
                                        back.append(' ');\r
                                }\r