Patch for fixes for Review Comments

4 files changed, 9 insertions, 11 deletions

diff --git a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
index dc359a8b0..f1bc93f68 100644
--- a/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
+++ b/base/java-tools/src/com/netscape/cmstools/CMCRequest.java
@@ -673,10 +673,9 @@ public class CMCRequest {
         try {
             byte bvalue[] = str.getBytes();
             System.out.println("Data Return Control: ");
-            StringBuffer ss = new StringBuffer();
-            ss.append("   Value: ");
+            StringBuffer ss = new StringBuffer("   Value: ");
             for (int m = 0; m < bvalue.length; m++) {
-                ss.append(bvalue[m]).append(" ");
+                ss.append(bvalue[m] + " ");
             }
             System.out.println(ss.toString());
             OCTET_STRING s = new OCTET_STRING(bvalue);
@@ -758,9 +757,8 @@ public class CMCRequest {
         byte bb[] = sn.getBytes();
         System.out.println("SenderNonce control: ");
 
-        StringBuffer ss = new StringBuffer();
+        StringBuffer ss = new StringBuffer("   Value: ");
 
-        ss.append("   Value: ");
         for (int m = 0; m < bb.length; m++) {
             ss.append(bb[m] + " ");
         }
diff --git a/base/java-tools/src/com/netscape/cmstools/DRMTool.java b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
index 164931d6c..bb53f1bb3 100644
--- a/base/java-tools/src/com/netscape/cmstools/DRMTool.java
+++ b/base/java-tools/src/com/netscape/cmstools/DRMTool.java
@@ -2006,7 +2006,7 @@ public class DRMTool {
             }
 
             // terminate first line
-            revised_data.append(System.getProperty("line.separator"));
+            revised_data.append("\n");
 
             // process remaining lines
             int j = 0;
@@ -2020,7 +2020,7 @@ public class DRMTool {
                 j++;
 
                 if (j == 76) {
-                    revised_data.append(System.getProperty("line.separator"));
+                    revised_data.append("\n");
                     j = 0;
                 }
             }
diff --git a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
index 1e123b17a..f5b4e2c2c 100644
--- a/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
+++ b/base/java-tools/src/com/netscape/cmstools/PasswordCache.java
@@ -446,7 +446,7 @@ class PWsdrCache {
         String bufs = null;
 
         if (tagPwds == null) {
-            stringToAdd.append(tag + ":" + pwd + System.getProperty("line.separator"));
+            stringToAdd.append(tag + ":" + pwd + "\n");
         } else {
             Enumeration<String> enum1 = tagPwds.keys();
 
@@ -455,7 +455,7 @@ class PWsdrCache {
                 pwd = tagPwds.get(tag);
                 debug("password tag: " + tag + " stored in " + mPWcachedb);
 
-                stringToAdd.append(tag + ":" + pwd + System.getProperty("line.separator"));
+                stringToAdd.append(tag + ":" + pwd + "\n");
             }
         }
 
@@ -672,7 +672,7 @@ class PWsdrCache {
         while (enum1.hasMoreElements()) {
             String tag = enum1.nextElement();
             String pwd = ht.get(tag);
-            returnString.append(tag + ":" + pwd + System.getProperty("line.separator"));
+            returnString.append(tag + ":" + pwd + "\n");
 
         }
         return returnString.toString();
diff --git a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
index 86bb82155..e9056dd48 100644
--- a/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
+++ b/base/java-tools/src/com/netscape/cmstools/PrettyPrintCrl.java
@@ -73,7 +73,7 @@ public class PrettyPrintCrl {
 
         BufferedReader inputCrl = null;
         String encodedBASE64CrlChunk = "";
-        StringBuffer encodedBASE64Crl = new StringBuffer(0);
+        StringBuffer encodedBASE64Crl = new StringBuffer();
 
         byte decodedBASE64Crl[] = null;
         X509CRLImpl crl = null;