1. Fix bug for wrong Variable name in msa file

[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 7cb2e9d526537b3062889d6ccca7911f91db6a98..d5d16b8d651d496d8ff6e1c7acddbf60f457552f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -38,35 +38,6 @@ public class Tools {
     //\r
     public static String dirForNewSpd = null;\r
 \r
-    /**\r
-     Used for test\r
-     \r
-     @param args\r
-     \r
-     **/\r
-    public static void main(String[] args) {\r
-        System.out.println(getCurrentDateTime());\r
-        //        Vector<String> v = new Vector<String>();\r
-        //        Vector<String> v1 = new Vector<String>();\r
-        //        \r
-        //        v.addElement("CAC");\r
-        //        v1.addElement("1111");\r
-        //        v.addElement("1AC");\r
-        //        v1.addElement("2222");\r
-        //        v.addElement("ABC");\r
-        //        v1.addElement("3333");\r
-        //        v.addElement("0C");\r
-        //        v1.addElement("4444");\r
-        //        v.addElement("AAC");\r
-        //        v1.addElement("5555");\r
-        //        Vector<Integer> vs = new Vector<Integer>();\r
-        //        vs = Tools.getVectorSortSequence(v, DataType.Sort_Type_Ascending);\r
-        //        Tools.sortVectorString(v1, Tools.getVectorSortSequence(v, DataType.Sort_Type_Ascending));\r
-        //        \r
-        //        Tools.sortVectorString(v, DataType.Sort_Type_Ascending);\r
-        //        Tools.sortVectorString(v, DataType.Sort_Type_Descending);\r
-    }\r
-\r
     /**\r
      Get current date and time and format it as "yyyy-MM-dd HH:mm"\r
      \r
@@ -407,4 +378,83 @@ public class Tools {
 \r
         return strReturn;\r
     }\r
+    \r
+    public static String convertUnicodeHexStringToString(String str) {\r
+        //\r
+        // Handle if str is null or empty\r
+        //\r
+        if (str == null) {\r
+            return "";\r
+        }\r
+        if (str.equals("")) {\r
+            return "";\r
+        }\r
+\r
+        String returnString = "";\r
+        String[] strArray = str.split(" ");\r
+        for (int index = 0; index < strArray.length; index++) {\r
+            String s = strArray[index];\r
+            if (s.length() == 6 && s.indexOf(DataType.HEX_STRING_HEADER) == 0) {\r
+                s = s.substring(DataType.HEX_STRING_HEADER.length());\r
+            } else {\r
+                Log.err("convertUnicodeHexStringToString", "Wrong input string: " + str);\r
+                continue;\r
+            }\r
+            //\r
+            // Change hex to dec\r
+            //\r
+            int dec = Integer.parseInt(s, 16);\r
+            \r
+            returnString = returnString + (char)(dec);\r
+        }\r
+        return returnString;\r
+    }\r
+\r
+    /**\r
+     Convert input string to unicode hex string\r
+     \r
+     @param str input string\r
+     @return unicode hex string\r
+     \r
+     **/\r
+    public static String convertStringToUnicodeHexString(String str) {\r
+        //\r
+        // Handle if str is null or empty\r
+        //\r
+        if (str == null) {\r
+            return "";\r
+        }\r
+        if (str.equals("")) {\r
+            return "";\r
+        }\r
+\r
+        //\r
+        // convert string to hex string\r
+        //\r
+        String hexString = "";\r
+        for (int index = 0; index < str.length(); index++) {\r
+            int codePoint = str.codePointAt(index);\r
+            String s = Integer.toHexString(codePoint);\r
+            //\r
+            // Make the string to four length\r
+            //\r
+            if (s.length() == 3) {\r
+                s = "0" + s;\r
+            } else if (s.length() == 2) {\r
+                s = "00" + s;\r
+            } else if (s.length() == 1) {\r
+                s = "000" + s;\r
+            }\r
+\r
+            //\r
+            // Add the string to return hex string\r
+            //\r
+            hexString = hexString + DataType.HEX_STRING_HEADER + s + " ";\r
+        }\r
+\r
+        //\r
+        // return hex string\r
+        //\r
+        return hexString.trim();\r
+    }\r
 }\r