1. Fix EDKT319 "Can't save when changing value of "PCD Is Driver" on MsaHeader page"

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / common / Tools.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
index e6647d24cc06010919be2c556025fa95214ae3c3..33dc521eda14dc710cd69a40842e09a006d896dd 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -354,7 +354,7 @@ public class Tools {
                 // Finish previous line\r
                 //\r
                 if (!isCopied) {\r
-                    strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;\r
+                    strReturn = strReturn + strTemp + DataType.LINE_SEPARATOR;\r
                     strTemp = "";\r
                 }\r
                 //\r
@@ -376,8 +376,12 @@ public class Tools {
                     strTemp = strTemp + " " + ss;\r
                     continue;\r
                 } else {\r
-                    strReturn = strReturn + strTemp + DataType.UNIX_LINE_SEPARATOR;\r
-                    strTemp = ss + " ";\r
+                    strReturn = strReturn + strTemp + DataType.LINE_SEPARATOR;\r
+                    if ((index == s.length - 1) && (!ss.equals(""))) {\r
+                        strReturn = strReturn + ss;\r
+                    } else {\r
+                        strTemp = ss + " ";\r
+                    }\r
                     isCopied = true;\r
                 }\r
             }\r
@@ -632,7 +636,7 @@ public class Tools {
         count = wholeString.split(searchString).length;\r
         return count;\r
     }\r
-    \r
+\r
     /**\r
      * Check the input data is empty or not\r
      * \r