auto adjust pcd settings when display existing ModuleSA settings. if new PCD added...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1214 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 8296b21eb4ed681ee6d45331aca342c8569c3489..3d3e8f30988fa8d8de0bc1197f27b7d4c0301137 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -102,13 +102,13 @@ public class FpdFileContents {
           }\r
           ListIterator<ModuleSADocument.ModuleSA> li = l.listIterator();\r
           while (li.hasNext()) {\r
-              ModuleSADocument.ModuleSA msa = li.next();\r
-              if (msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null) {\r
+              ModuleSADocument.ModuleSA moduleSa = li.next();\r
+              if (moduleSa.getPcdBuildDefinition() == null || moduleSa.getPcdBuildDefinition().getPcdDataList() == null) {\r
                   continue;\r
               }\r
-              String ModuleInfo = msa.getModuleGuid() + " " + msa.getModuleVersion() +\r
-               " " + msa.getPackageGuid() + " " + msa.getPackageVersion() + " " + listToString(msa.getSupArchList());\r
-              List<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> lp = msa.getPcdBuildDefinition().getPcdDataList();\r
+              String ModuleInfo = moduleSa.getModuleGuid() + " " + moduleSa.getModuleVersion() +\r
+               " " + moduleSa.getPackageGuid() + " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList());\r
+              List<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> lp = moduleSa.getPcdBuildDefinition().getPcdDataList();\r
               ListIterator<PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData> lpi = lp.listIterator();\r
               while (lpi.hasNext()) {\r
                   PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = lpi.next();\r
@@ -230,32 +230,32 @@ public class FpdFileContents {
         }\r
         ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
         while(li.hasNext()) {\r
-            ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();\r
-            if (msa.getModuleGuid().equalsIgnoreCase(s[0]) && msa.getPackageGuid().equalsIgnoreCase(s[2])) {\r
-                if (msa.getModuleVersion() != null) {\r
-                    if (!msa.getModuleVersion().equals(s[1])) {\r
+            ModuleSADocument.ModuleSA moduleSa = (ModuleSADocument.ModuleSA)li.next();\r
+            if (moduleSa.getModuleGuid().equalsIgnoreCase(s[0]) && moduleSa.getPackageGuid().equalsIgnoreCase(s[2])) {\r
+                if (moduleSa.getModuleVersion() != null) {\r
+                    if (!moduleSa.getModuleVersion().equals(s[1])) {\r
                         continue;\r
                     }\r
                 }\r
-                if (msa.getPackageVersion() != null) {\r
-                    if (!msa.getPackageVersion().equals(s[3])) {\r
+                if (moduleSa.getPackageVersion() != null) {\r
+                    if (!moduleSa.getPackageVersion().equals(s[3])) {\r
                         continue;\r
                     }\r
                 }\r
                 //ToDo add arch check for s[4]\r
-                if (msa.getSupArchList() != null) {\r
-                    if (!listToString(msa.getSupArchList()).equals(s[4])) {\r
+                if (moduleSa.getSupArchList() != null) {\r
+                    if (!listToString(moduleSa.getSupArchList()).equals(s[4])) {\r
                         continue;\r
                     }\r
                 }\r
-                return msa;\r
+                return moduleSa;\r
             }\r
         }\r
         return null;\r
     }\r
     \r
     private ModuleSADocument.ModuleSA getModuleSA(int i) {\r
-        ModuleSADocument.ModuleSA msa = null;\r
+        ModuleSADocument.ModuleSA moduleSa = null;\r
         if (fpdRoot.getFrameworkModules() == null) {\r
             return null;\r
         }\r
@@ -264,10 +264,10 @@ public class FpdFileContents {
             for (int j = 0; j < i; ++j) {\r
                 cursor.toNextSibling();\r
             }\r
-            msa = (ModuleSADocument.ModuleSA)cursor.getObject();\r
+            moduleSa = (ModuleSADocument.ModuleSA)cursor.getObject();\r
         }\r
         cursor.dispose();\r
-        return msa;\r
+        return moduleSa;\r
     }\r
     \r
     public void removeModuleSA(int i) {\r
@@ -311,6 +311,103 @@ public class FpdFileContents {
         cursor.dispose();\r
     }\r
     \r
+    public boolean adjustPcd (int seqModuleSa) throws Exception {\r
+        boolean dataModified = false;\r
+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(seqModuleSa);\r
+        int pcdCount = getPcdDataCount(seqModuleSa);\r
+        String[][] saaModuleSaPcd = new String[pcdCount][7];\r
+        getPcdData(seqModuleSa, saaModuleSaPcd);\r
+        String mg = moduleSa.getModuleGuid();\r
+        String mv = moduleSa.getModuleVersion();\r
+        String pg = moduleSa.getPackageGuid();\r
+        String pv = moduleSa.getPackageVersion();\r
+        String arch = listToString(moduleSa.getSupArchList());\r
+        //\r
+        // delete pcd in ModuleSA but not in MSA files any longer.\r
+        //\r
+        String moduleKey = mg + " " + mv + " " + pg + " " + pv + " " + arch;\r
+        int libCount = getLibraryInstancesCount(moduleKey);\r
+        String[][] saaLib = new String[libCount][5];\r
+        getLibraryInstances(moduleKey, saaLib);\r
+        ModuleIdentification mi = GlobalData.getModuleId(moduleKey);\r
+        Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
+        vMi.add(mi);\r
+        try {\r
+    nextPcd:for (int i = 0; i < saaModuleSaPcd.length; ++i) {\r
+                if (GlobalData.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], mi)){\r
+                    continue;\r
+                }\r
+                for (int j = 0; j < saaLib.length; ++j) {\r
+                    String libKey = saaLib[j][1] + " " + saaLib[j][2] + " " + saaLib[j][3] + " " + saaLib[j][4];\r
+                    ModuleIdentification libMi = GlobalData.getModuleId(libKey);\r
+                    vMi.add(libMi);\r
+                    if (GlobalData.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], libMi)) {\r
+                        continue nextPcd;\r
+                    }\r
+                }\r
+                removePcdData(seqModuleSa, saaModuleSaPcd[i][0], saaModuleSaPcd[i][1]);\r
+                dataModified = true;\r
+            }\r
+        }\r
+        catch (Exception e) {\r
+            \r
+        }\r
+        //\r
+        // add new Pcd from MSA file to ModuleSA.\r
+        //\r
+        try {\r
+       \r
+            for (int i = 0; i < vMi.size(); ++i) {\r
+                ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea) GlobalData\r
+                                                                                                                          .getModuleXmlObject(vMi\r
+                                                                                                                                                 .get(i));\r
+                if (msa.getPcdCoded() == null || msa.getPcdCoded().getPcdEntryList() == null) {\r
+                    continue;\r
+                }\r
+                ListIterator li = msa.getPcdCoded().getPcdEntryList().listIterator();\r
+     msaPcdIter:while (li.hasNext()) {\r
+                    PcdCodedDocument.PcdCoded.PcdEntry msaPcd = (PcdCodedDocument.PcdCoded.PcdEntry) li.next();\r
+                    ArrayList<String> al = getDynPcdMapValue(msaPcd.getCName() + " " + msaPcd.getTokenSpaceGuidCName());\r
+                    if (al != null) {\r
+                        for (int j = 0; j < al.size(); ++j) {\r
+                            if (al.get(j).contains(moduleKey)) {\r
+                                continue msaPcdIter;\r
+                            }\r
+                        }\r
+                    }\r
+                    \r
+                    Map<String, XmlObject> m = new HashMap<String, XmlObject>();\r
+                    m.put("ModuleSurfaceArea", msa);\r
+                    SurfaceAreaQuery.setDoc(m);\r
+                    PackageIdentification[] depPkgs = SurfaceAreaQuery.getDependencePkg(null);\r
+                    PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
+                    if (spdPcd == null) {\r
+                        //\r
+                        // ToDo Error \r
+                        //\r
+                        throw new PcdDeclNotFound("No Declaration for PCD Entry " + msaPcd.getCName() + " in Module "\r
+                                                  + mi.getName());\r
+                    }\r
+                    //\r
+                    // AddItem to ModuleSA PcdBuildDefinitions\r
+                    //\r
+                    String defaultVal = msaPcd.getDefaultValue() == null ? spdPcd.getDefaultValue()\r
+                                                                        : msaPcd.getDefaultValue();\r
+\r
+                    genPcdData(msaPcd.getCName(), spdPcd.getToken(), msaPcd.getTokenSpaceGuidCName(),\r
+                               msaPcd.getPcdItemType().toString(), spdPcd.getDatumType() + "", defaultVal, moduleSa);\r
+                    dataModified = true;\r
+                 }\r
+\r
+            }\r
+        }\r
+        catch (Exception e){\r
+           throw e;\r
+        }\r
+        \r
+        return dataModified;\r
+    }\r
+    \r
     private void maintainDynPcdMap(String pcdKey, String moduleInfo) {\r
         \r
         ArrayList<String> al = dynPcdMap.get(pcdKey);\r
@@ -340,7 +437,7 @@ public class FpdFileContents {
     //\r
     // key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
     //\r
-    public int getPcdDataCount(int i){\r
+    public int getPcdDataCount (int i){\r
         ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
         \r
         if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
@@ -350,7 +447,7 @@ public class FpdFileContents {
         \r
     }\r
     \r
-    public void getPcdData(int i, String[][] saa) {\r
+    public void getPcdData (int i, String[][] saa) {\r
         ModuleSADocument.ModuleSA msa = getModuleSA(i);\r
         \r
         if (msa == null || msa.getPcdBuildDefinition() == null || msa.getPcdBuildDefinition().getPcdDataList() == null){\r
@@ -370,13 +467,46 @@ public class FpdFileContents {
         }\r
     }\r
     \r
-    public void updatePcdData(String key, String cName, String tsGuid, String itemType, String maxSize, String value){\r
-        ModuleSADocument.ModuleSA msa = getModuleSA(key);\r
-        if (msa == null || msa.getPcdBuildDefinition() == null){\r
+    public void removePcdData (int seqModuleSa, String cName, String tsGuid) {\r
+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(seqModuleSa);\r
+        if (moduleSa == null || moduleSa.getPcdBuildDefinition() == null){\r
             return;\r
         }\r
         \r
-        XmlCursor cursor = msa.getPcdBuildDefinition().newCursor();\r
+        String mg = moduleSa.getModuleGuid();\r
+        String mv = moduleSa.getModuleVersion();\r
+        String pg = moduleSa.getPackageGuid();\r
+        String pv = moduleSa.getPackageVersion();\r
+        String arch = listToString(moduleSa.getSupArchList());\r
+        String moduleKey = mg + " " + mv + " " + pg + " " + pv + " " + arch;\r
+        \r
+        XmlCursor cursor = moduleSa.getPcdBuildDefinition().newCursor();\r
+        if (cursor.toFirstChild()){\r
+            \r
+            do {\r
+                PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
+                if (pcdData.getCName().equals(cName) && pcdData.getTokenSpaceGuidCName().equals(tsGuid)) {\r
+                    maintainDynPcdMap(cName + " " + tsGuid, moduleKey);\r
+                    if (getPcdDataCount(seqModuleSa) == 1) {\r
+                        cursor.toParent();\r
+                    }\r
+                    cursor.removeXml();\r
+                    break;\r
+                }\r
+            }\r
+            while(cursor.toNextSibling());\r
+            \r
+        }\r
+        cursor.dispose();\r
+    }\r
+    \r
+    public void updatePcdData (String key, String cName, String tsGuid, String itemType, String maxSize, String value){\r
+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(key);\r
+        if (moduleSa == null || moduleSa.getPcdBuildDefinition() == null){\r
+            return;\r
+        }\r
+        \r
+        XmlCursor cursor = moduleSa.getPcdBuildDefinition().newCursor();\r
         if (cursor.toFirstChild()){\r
             do {\r
                 PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
@@ -400,7 +530,7 @@ public class FpdFileContents {
      * @param sa Results: HelpText, Original item type.\r
      * @return\r
      */\r
-    public boolean getPcdBuildDataInfo(ModuleIdentification mi, String cName, String[] sa) throws Exception{\r
+    public boolean getPcdBuildDataInfo(ModuleIdentification mi, String cName, String tsGuid, String[] sa) throws Exception{\r
         try {\r
            \r
             ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)GlobalData.getModuleXmlObject(mi);\r
@@ -422,6 +552,9 @@ public class FpdFileContents {
                 if (!msaPcd.getCName().equals(cName)) {\r
                     continue;\r
                 }\r
+                if (!msaPcd.getTokenSpaceGuidCName().equals(tsGuid)) {\r
+                    continue;\r
+                }\r
                 PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
                 if (spdPcd == null) {\r
                     //\r
@@ -571,7 +704,7 @@ public class FpdFileContents {
         XmlCursor cursor = instance.newCursor();\r
         try{\r
             String comment = "Pkg: " + pn + " Mod: " + mn \r
-                + " Path: " + GlobalData.getMsaFile(libMi).getPath();\r
+                + " Path: " + GlobalData.getMsaFile(libMi).getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
             cursor.insertComment(comment);\r
         }\r
         catch (Exception e){\r
@@ -830,7 +963,7 @@ public class FpdFileContents {
         XmlCursor cursor = msa.newCursor();\r
         try{\r
             String comment = "Mod: " + mi.getName() + " Type: " + mi.getModuleType() + " Path: "\r
-                            + GlobalData.getMsaFile(mi).getPath();\r
+                            + GlobalData.getMsaFile(mi).getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
             cursor.insertComment(comment);\r
         }\r
         catch(Exception e){\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index d260bf5a7a70e165b2e2736857d215fa3324adc5..56375e1b38396e68275e4d9f239f1022d34439fa 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -336,6 +336,15 @@ public class FpdFrameworkModules extends IInternalFrame {
                     \r
                     TableSorter sorter = (TableSorter)jTableFpdModules.getModel();\r
                     selectedRow = sorter.modelIndex(selectedRow);\r
+                    try {\r
+                        if (ffc.adjustPcd(selectedRow)) {\r
+                            docConsole.setSaved(false);\r
+                        }\r
+                    }\r
+                    catch (Exception exp) {\r
+                        JOptionPane.showMessageDialog(frame, exp.getMessage());\r
+                        return;\r
+                    }\r
                     \r
                     if (settingDlg == null) {\r
                         settingDlg = new FpdModuleSA(ffc);\r
@@ -355,6 +364,7 @@ public class FpdFrameworkModules extends IInternalFrame {
         }\r
         return jButtonSettings;\r
     }\r
+ \r
 \r
     /**\r
      * This method initializes jButton2        \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
index d2ef9997b2f495a95358916a9f4afbd90975e1a4..5ebcb20d396b2cdbe4a53b814e4bc6d11bd1eb31 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
@@ -551,8 +551,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
                     else{\r
                         int selectedRow = lsm.getMinSelectionIndex();\r
                         String cName = jTablePcd.getValueAt(selectedRow, 0)+"";\r
+                        String tsGuid = jTablePcd.getValueAt(selectedRow, 1)+"";\r
                         String[] pcdInfo = {"", ""};\r
-                        getPcdInfo(cName, pcdInfo);\r
+                        getPcdInfo(cName, tsGuid, pcdInfo);\r
                         jTextAreaPcdHelp.setText(pcdInfo[0]);\r
                         initComboBox(pcdInfo[1]);\r
                         jComboBoxItemType.setSelectedItem(pcdInfo[1]);\r
@@ -632,17 +633,17 @@ public class FpdModuleSA extends JDialog implements ActionListener {
         }\r
     }\r
     \r
-    private void getPcdInfo(String cName, String[] sa) {\r
+    private void getPcdInfo(String cName, String tsGuid, String[] sa) {\r
         String[][] saa = new String[ffc.getLibraryInstancesCount(moduleKey)][5];\r
         ffc.getLibraryInstances(moduleKey, saa);\r
         \r
         try{\r
-            if (ffc.getPcdBuildDataInfo(GlobalData.getModuleId(moduleKey), cName, sa)) {\r
+            if (ffc.getPcdBuildDataInfo(GlobalData.getModuleId(moduleKey), cName, tsGuid, sa)) {\r
                 return;\r
             }\r
             for (int j = 0; j < saa.length; ++j) {\r
                 if (ffc.getPcdBuildDataInfo(GlobalData.getModuleId(saa[j][1] + " " + saa[j][2] + " " + saa[j][3] + " " + saa[j][4]),\r
-                                            cName, sa)) {\r
+                                            cName, tsGuid, sa)) {\r
                     return;\r
                 }\r
             }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java
index 44f6f36b34d16504be69a0d102879a77bfd0ea4f..457208b4e358c252c8886802dbccd359e9e0abc5 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/GlobalData.java
@@ -20,6 +20,7 @@ import org.apache.xmlbeans.XmlObject;
 import org.tianocore.DbPathAndFilename;\r
 import org.tianocore.FrameworkDatabaseDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument;\r
+import org.tianocore.PcdCodedDocument;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
 import org.tianocore.frameworkwizard.platform.ui.id.FpdModuleIdentification;\r
 import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
@@ -464,7 +465,7 @@ public class GlobalData {
         return null;\r
     }\r
     \r
-    public static Vector<String> getModuleSupArchs(ModuleIdentification mi) throws Exception{\r
+    public static Vector<String> getModuleSupArchs(ModuleIdentification mi) throws Exception {\r
         Vector<String> vArchs = null;\r
         ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)getModuleXmlObject(mi);\r
         if (msa.getModuleDefinitions() == null || msa.getModuleDefinitions().getSupportedArchitectures() == null) {\r
@@ -481,6 +482,21 @@ public class GlobalData {
         return vArchs;\r
     }\r
     \r
+    public static boolean pcdInMsa (String cName, String tsGuid, ModuleIdentification mi) throws Exception {\r
+        ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)getModuleXmlObject(mi);\r
+        if (msa.getPcdCoded() == null || msa.getPcdCoded().getPcdEntryList() == null) {\r
+            return false;\r
+        }\r
+        ListIterator li = msa.getPcdCoded().getPcdEntryList().listIterator();\r
+        while (li.hasNext()) {\r
+            PcdCodedDocument.PcdCoded.PcdEntry msaPcd = (PcdCodedDocument.PcdCoded.PcdEntry)li.next();\r
+            if (msaPcd.getCName().equals(cName) && msaPcd.getTokenSpaceGuidCName().equals(tsGuid)) {\r
+                return true;\r
+            }\r
+        }\r
+        return false;\r
+    }\r
+    \r
 }\r
 \r
 final class KeyComparator implements Comparator<String> {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
index 1f6ea98f51797bdca3b047a2812787faa5c30fe6..a3b08065b3cbf6c621fe8bf2d0455a6234e3e233 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/global/SurfaceAreaQuery.java
@@ -893,71 +893,10 @@ public class SurfaceAreaQuery {
                return null;\r
        }\r
 \r
-       /**\r
-        * Get the PcdToken array from module's surface area document. The array\r
-        * should contains following data:\r
-        * <p>\r
-        * -------------------------------------------------------------------\r
-        * </p>\r
-        * <p>\r
-        * CName | ItemType | TokenspaceName | DefaultValue | Usage | HelpText\r
-        * </p>\r
-        * <p>\r
-        * -------------------------------------------------------------------\r
-        * </p>\r
-        * <p>\r
-        * Note: Until new schema applying, now we can only get CName, ItemType,\r
-        * </p>\r
-        * \r
-        * @return 2-array table contains all information of PCD token retrieved\r
-        *         from MSA.\r
-        */\r
-       public static Object[][] etModulePCDTokenArray() {\r
-               return null;\r
-               // int index;\r
-               // Object[][] result;\r
-               // PCDs.PcdData[] pcds;\r
-               // String[] xPath = new String[] { "/PcdData" };\r
-               // XmlObject[] returns = get("PCDs", xPath);\r
-               //\r
-               // if ((returns == null) || (returns.length == 0)) {\r
-               // return null;\r
-               // }\r
-               //\r
-               // pcds = (PCDs.PcdData[]) returns;\r
-               // result = new Object[pcds.length][6];\r
-               // for (index = 0; index < pcds.length; index++) {\r
-               // //\r
-               // // Get CName\r
-               // //\r
-               // result[index][0] = pcds[index].getCName();\r
-               // //\r
-               // // Get ItemType: FEATURE_FLAG, FIXED_AT_BUILD, PATCHABLE_IN_MODLE,\r
-               // // DYNAMIC, DYNAMIC_EX\r
-               // //\r
-               // if (pcds[index].getItemType() != null) {\r
-               // result[index][1] = pcds[index].getItemType().toString();\r
-               // } else {\r
-               // result[index][1] = null;\r
-               // }\r
-               //\r
-               // //\r
-               // // BUGBUG: following field can *not* be got from current MSA until\r
-               // // schema changed.\r
-               // //\r
-               // // result [index][2] = pcds[index].getTokenSpaceName();\r
-               // result[index][2] = null;\r
-               // result[index][3] = pcds[index].getDefaultValue();\r
-               // // result [index][4] = pcds[index].getUsage ();\r
-               // result[index][4] = null;\r
-               // // result [index][5] = pcds[index].getHelpText ();\r
-               // result[index][5] = null;\r
-               // }\r
-               // return result;\r
-       }\r
+       \r
 \r
        /**\r
-        * Retrieve MAS header\r
+        * Retrieve MSA header\r
         * \r
         * @return\r
         * @return\r