1. Fix the bug missing TokenSpaceGuidCName when editing a pcd entry in Msa

[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 517c4b1b3a8d6496d1e932c278f0bf02054866ff..0bfca453cdf9eca2f76e17b9b71059b264c3f248 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -28,6 +28,8 @@ import javax.swing.JList;
 import javax.swing.JOptionPane;\r
 \r
 import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.PcdCoded.PcdIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.PcdCoded.PcdVector;\r
 import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
 import org.tianocore.frameworkwizard.platform.PlatformIdentification;\r
 \r
@@ -50,25 +52,25 @@ public class Tools {
      **/\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
+        //        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
@@ -166,27 +168,27 @@ public class Tools {
             }\r
         }\r
     }\r
-    \r
+\r
     /**\r
-    Generate selection items for JList by input vector\r
-    \r
-    **/\r
-   public static void generateListByVector(JList jl, Vector<String> vector) {\r
-       if (jl != null) {\r
-           DefaultListModel listModel = (DefaultListModel) jl.getModel();\r
-           listModel.removeAllElements();\r
-           \r
-           if (vector != null) {\r
-               for (int index = 0; index < vector.size(); index++) {\r
-                   listModel.addElement(vector.get(index));\r
-               }\r
-           }\r
-           \r
-           if (listModel.size() > 0) {\r
-               jl.setSelectedIndex(0);\r
-           }\r
-       }\r
-   }\r
+     Generate selection items for JList by input vector\r
+     \r
+     **/\r
+    public static void generateListByVector(JList jl, Vector<String> vector) {\r
+        if (jl != null) {\r
+            DefaultListModel listModel = (DefaultListModel) jl.getModel();\r
+            listModel.removeAllElements();\r
+\r
+            if (vector != null) {\r
+                for (int index = 0; index < vector.size(); index++) {\r
+                    listModel.addElement(vector.get(index));\r
+                }\r
+            }\r
+\r
+            if (listModel.size() > 0) {\r
+                jl.setSelectedIndex(0);\r
+            }\r
+        }\r
+    }\r
 \r
     /**\r
      Get path only from a path\r
@@ -305,8 +307,8 @@ public class Tools {
             match = DataType.FILE_EXT_SEPARATOR + DataType.TEXT_FILE_EXT;\r
         }\r
         if (type == DataType.RETURN_TYPE_FAR_SURFACE_AREA) {\r
-          match = DataType.FILE_EXT_SEPARATOR + DataType.FAR_SURFACE_AREA_EXT;\r
-      }\r
+            match = DataType.FILE_EXT_SEPARATOR + DataType.FAR_SURFACE_AREA_EXT;\r
+        }\r
         if (path.length() <= match.length()) {\r
             path = path + match;\r
             return path;\r
@@ -395,7 +397,7 @@ public class Tools {
                     String tempStr = v.get(indexI);\r
                     v.setElementAt(v.get(indexJ), indexI);\r
                     v.setElementAt(tempStr, indexJ);\r
-                    \r
+\r
                     //\r
                     // Swap sequences\r
                     //\r
@@ -427,14 +429,14 @@ public class Tools {
             }\r
         }\r
     }\r
-    \r
+\r
     /**\r
      Sort all modules\r
      \r
      @param v\r
      @param mode\r
-    \r
-    **/\r
+     \r
+     **/\r
     public static void sortModules(Vector<ModuleIdentification> v, int mode) {\r
         if (v != null) {\r
             //\r
@@ -452,54 +454,79 @@ public class Tools {
             }\r
         }\r
     }\r
+\r
+    /**\r
+     Sort all packages\r
+     \r
+     @param v\r
+     @param mode\r
+     \r
+     **/\r
+    public static void sortPackages(Vector<PackageIdentification> v, int mode) {\r
+        if (v != null) {\r
+            //\r
+            // sort by name\r
+            //\r
+            for (int indexI = 0; indexI < v.size(); indexI++) {\r
+                for (int indexJ = indexI + 1; indexJ < v.size(); indexJ++) {\r
+                    if ((v.get(indexJ).getName().compareTo(v.get(indexI).getName()) < 0 && mode == DataType.SORT_TYPE_ASCENDING)\r
+                        || (v.get(indexI).getName().compareTo(v.get(indexJ).getName()) < 0 && mode == DataType.SORT_TYPE_DESCENDING)) {\r
+                        PackageIdentification temp = v.get(indexI);\r
+                        v.setElementAt(v.get(indexJ), indexI);\r
+                        v.setElementAt(temp, indexJ);\r
+                    }\r
+                }\r
+            }\r
+        }\r
+    }\r
+\r
+    /**\r
+     Sort all platforms\r
+     \r
+     @param v\r
+     @param mode\r
+     \r
+     **/\r
+    public static void sortPlatforms(Vector<PlatformIdentification> v, int mode) {\r
+        if (v != null) {\r
+            //\r
+            // sort by name\r
+            //\r
+            for (int indexI = 0; indexI < v.size(); indexI++) {\r
+                for (int indexJ = indexI + 1; indexJ < v.size(); indexJ++) {\r
+                    if ((v.get(indexJ).getName().compareTo(v.get(indexI).getName()) < 0 && mode == DataType.SORT_TYPE_ASCENDING)\r
+                        || (v.get(indexI).getName().compareTo(v.get(indexJ).getName()) < 0 && mode == DataType.SORT_TYPE_DESCENDING)) {\r
+                        PlatformIdentification temp = v.get(indexI);\r
+                        v.setElementAt(v.get(indexJ), indexI);\r
+                        v.setElementAt(temp, indexJ);\r
+                    }\r
+                }\r
+            }\r
+        }\r
+    }\r
     \r
     /**\r
-    Sort all packages\r
+     Sort all pcd entries\r
+     \r
+     @param v\r
+     @param mode\r
     \r
-    @param v\r
-    @param mode\r
-   \r
-   **/\r
-   public static void sortPackages(Vector<PackageIdentification> v, int mode) {\r
-       if (v != null) {\r
-           //\r
-           // sort by name\r
-           //\r
-           for (int indexI = 0; indexI < v.size(); indexI++) {\r
-               for (int indexJ = indexI + 1; indexJ < v.size(); indexJ++) {\r
-                   if ((v.get(indexJ).getName().compareTo(v.get(indexI).getName()) < 0 && mode == DataType.SORT_TYPE_ASCENDING)\r
-                       || (v.get(indexI).getName().compareTo(v.get(indexJ).getName()) < 0 && mode == DataType.SORT_TYPE_DESCENDING)) {\r
-                       PackageIdentification temp = v.get(indexI);\r
-                       v.setElementAt(v.get(indexJ), indexI);\r
-                       v.setElementAt(temp, indexJ);\r
-                   }\r
-               }\r
-           }\r
-       }\r
-   }\r
-   \r
-   /**\r
-   Sort all platforms\r
-   \r
-   @param v\r
-   @param mode\r
-  \r
-  **/\r
-  public static void sortPlatforms(Vector<PlatformIdentification> v, int mode) {\r
-      if (v != null) {\r
-          //\r
-          // sort by name\r
-          //\r
-          for (int indexI = 0; indexI < v.size(); indexI++) {\r
-              for (int indexJ = indexI + 1; indexJ < v.size(); indexJ++) {\r
-                  if ((v.get(indexJ).getName().compareTo(v.get(indexI).getName()) < 0 && mode == DataType.SORT_TYPE_ASCENDING)\r
-                      || (v.get(indexI).getName().compareTo(v.get(indexJ).getName()) < 0 && mode == DataType.SORT_TYPE_DESCENDING)) {\r
-                      PlatformIdentification temp = v.get(indexI);\r
-                      v.setElementAt(v.get(indexJ), indexI);\r
-                      v.setElementAt(temp, indexJ);\r
-                  }\r
-              }\r
-          }\r
-      }\r
-  }\r
+    **/\r
+    public static void sortPcds(PcdVector v, int mode) {\r
+        if (v != null) {\r
+            //\r
+            // sort by name\r
+            //\r
+            for (int indexI = 0; indexI < v.size(); indexI++) {\r
+                for (int indexJ = indexI + 1; indexJ < v.size(); indexJ++) {\r
+                    if ((v.getPcd(indexJ).getName().compareTo(v.getPcd(indexI).getName()) < 0 && mode == DataType.SORT_TYPE_ASCENDING)\r
+                        || (v.getPcd(indexI).getName().compareTo(v.getPcd(indexJ).getName()) < 0 && mode == DataType.SORT_TYPE_DESCENDING)) {\r
+                        PcdIdentification temp = v.getPcd(indexI);\r
+                        v.setPcd(v.getPcd(indexJ), indexI);\r
+                        v.setPcd(temp, indexJ);\r
+                    }\r
+                }\r
+            }\r
+        }\r
+    }\r
 }\r