]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
1. Enhance Source Files selection in msa:
[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / workspace / WorkspaceTools.java
index c6432ac284ab4902f34b38ce3033fb71e5f4ea1b..16cfaad87a7307bc0b0943fe337823c71e8b2a05 100644 (file)
  **/\r
 package org.tianocore.frameworkwizard.workspace;\r
 \r
+import java.io.File;\r
 import java.io.IOException;\r
+import java.util.List;\r
 import java.util.Vector;\r
 \r
+import org.apache.xmlbeans.XmlCursor;\r
 import org.apache.xmlbeans.XmlException;\r
 import org.tianocore.DbPathAndFilename;\r
-import org.tianocore.FrameworkDatabaseDocument;\r
+import org.tianocore.FrameworkDatabaseDocument.FrameworkDatabase;\r
+import org.tianocore.IndustryStdIncludesDocument.IndustryStdIncludes;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
 import org.tianocore.MsaFilesDocument.MsaFiles;\r
 import org.tianocore.MsaHeaderDocument.MsaHeader;\r
 import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;\r
 import org.tianocore.PlatformHeaderDocument.PlatformHeader;\r
 import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea;\r
+import org.tianocore.SourceFilesDocument.SourceFiles;\r
 import org.tianocore.SpdHeaderDocument.SpdHeader;\r
 import org.tianocore.frameworkwizard.common.DataType;\r
-import org.tianocore.frameworkwizard.common.Identification;\r
 import org.tianocore.frameworkwizard.common.Log;\r
-import org.tianocore.frameworkwizard.common.OpenFile;\r
 import org.tianocore.frameworkwizard.common.SaveFile;\r
+import org.tianocore.frameworkwizard.common.Sort;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
-import org.tianocore.frameworkwizard.module.Identification.ModuleIdentification;\r
+import org.tianocore.frameworkwizard.common.Identifications.Identification;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpenFile;\r
+import org.tianocore.frameworkwizard.far.FarHeader;\r
+import org.tianocore.frameworkwizard.far.FarIdentification;\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
@@ -41,7 +51,7 @@ public class WorkspaceTools {
     //\r
     // Define class members\r
     //\r
-    private FrameworkDatabaseDocument.FrameworkDatabase fdb = null;\r
+    private FrameworkDatabase fdb = null;\r
 \r
     private Vector<ModuleIdentification> vModuleList = new Vector<ModuleIdentification>();\r
 \r
@@ -54,17 +64,139 @@ public class WorkspaceTools {
      Open Framework Database file\r
      \r
      */\r
-    private void openFrameworkDb() {\r
+    private FrameworkDatabase openFrameworkDb() {\r
         String strFrameworkDbFilePath = Workspace.getCurrentWorkspace() + Workspace.getStrWorkspaceDatabaseFile();\r
         strFrameworkDbFilePath = Tools.convertPathToCurrentOsType(strFrameworkDbFilePath);\r
         try {\r
             fdb = OpenFile.openFrameworkDb(strFrameworkDbFilePath);\r
         } catch (XmlException e) {\r
             Log.err("Open Framework Database " + strFrameworkDbFilePath, e.getMessage());\r
-            return;\r
+            return null;\r
         } catch (Exception e) {\r
             Log.err("Open Framework Database " + strFrameworkDbFilePath, "Invalid file type");\r
-            return;\r
+            return null;\r
+        }\r
+        return fdb;\r
+    }\r
+\r
+    public void addFarToDb(List<String> packageList, List<String> platformList, FarHeader far) {\r
+        FrameworkDatabase fdb = openFrameworkDb();\r
+\r
+        for (int i = 0; i < packageList.size(); i++) {\r
+            DbPathAndFilename item = DbPathAndFilename.Factory.newInstance();\r
+            item.setFarGuid(far.getGuidValue());\r
+            item.setStringValue(packageList.get(i));\r
+            fdb.getPackageList().getFilenameList().add(item);\r
+        }\r
+\r
+        for (int i = 0; i < platformList.size(); i++) {\r
+            DbPathAndFilename item = DbPathAndFilename.Factory.newInstance();\r
+            item.setFarGuid(far.getGuidValue());\r
+            item.setStringValue(platformList.get(i));\r
+            fdb.getPlatformList().getFilenameList().add(item);\r
+        }\r
+\r
+        DbPathAndFilename farItem = DbPathAndFilename.Factory.newInstance();\r
+        farItem.setFarGuid(far.getGuidValue());\r
+        farItem.setStringValue(far.getFarName());\r
+        fdb.getFarList().getFilenameList().add(farItem);\r
+\r
+        String strFrameworkDbFilePath = Workspace.getCurrentWorkspace() + Workspace.getStrWorkspaceDatabaseFile();\r
+        strFrameworkDbFilePath = Tools.convertPathToCurrentOsType(strFrameworkDbFilePath);\r
+\r
+        try {\r
+            SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
+        } catch (Exception e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r
+    public void removeFarFromDb(FarIdentification far) {\r
+        FrameworkDatabase fdb = openFrameworkDb();\r
+        //\r
+        // Remove Packages\r
+        //\r
+        XmlCursor cursor = fdb.getPackageList().newCursor();\r
+        cursor.toFirstChild();\r
+        do {\r
+            DbPathAndFilename item = (DbPathAndFilename) cursor.getObject();\r
+\r
+            if (item.getFarGuid() != null && item.getFarGuid().equalsIgnoreCase(far.getGuid())) {\r
+                cursor.removeXml();\r
+            }\r
+        } while (cursor.toNextSibling());\r
+        cursor.dispose();\r
+\r
+        //\r
+        // Remove Platforms\r
+        //\r
+        cursor = fdb.getPlatformList().newCursor();\r
+        cursor.toFirstChild();\r
+        do {\r
+            DbPathAndFilename item = (DbPathAndFilename) cursor.getObject();\r
+            if (item.getFarGuid() != null && item.getFarGuid().equalsIgnoreCase(far.getGuid())) {\r
+                cursor.removeXml();\r
+            }\r
+        } while (cursor.toNextSibling());\r
+\r
+        //\r
+        // Remove Far\r
+        //\r
+        cursor = fdb.getFarList().newCursor();\r
+        cursor.toFirstChild();\r
+        do {\r
+            DbPathAndFilename item = (DbPathAndFilename) cursor.getObject();\r
+            if (item.getFarGuid() != null && item.getFarGuid().equalsIgnoreCase(far.getGuid())) {\r
+                cursor.removeXml();\r
+            }\r
+        } while (cursor.toNextSibling());\r
+        cursor.dispose();\r
+\r
+        String strFrameworkDbFilePath = Workspace.getCurrentWorkspace() + Workspace.getStrWorkspaceDatabaseFile();\r
+        strFrameworkDbFilePath = Tools.convertPathToCurrentOsType(strFrameworkDbFilePath);\r
+        try {\r
+            SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
+        } catch (Exception e) {\r
+            e.printStackTrace();\r
+        }\r
+    }\r
+\r
+    public String getPackageFarGuid(Identification packageId) {\r
+        openFrameworkDb();\r
+\r
+        for (int index = 0; index < fdb.getPackageList().getFilenameList().size(); index++) {\r
+            DbPathAndFilename item = fdb.getPackageList().getFilenameArray(index);\r
+            String path = Workspace.getCurrentWorkspace() + DataType.FILE_SEPARATOR + item.getStringValue();\r
+            File tempFile = new File(path);\r
+            if (tempFile.getPath().equalsIgnoreCase(packageId.getPath())) {\r
+                return fdb.getPackageList().getFilenameArray(index).getFarGuid();\r
+            }\r
+        }\r
+\r
+        return null;\r
+    }\r
+\r
+    public String getPlatformFarGuid(Identification platformId) {\r
+        openFrameworkDb();\r
+\r
+        for (int index = 0; index < fdb.getPlatformList().getFilenameList().size(); index++) {\r
+            DbPathAndFilename item = fdb.getPlatformList().getFilenameArray(index);\r
+            String path = Workspace.getCurrentWorkspace() + DataType.FILE_SEPARATOR + item.getStringValue();\r
+            File tempFile = new File(path);\r
+            if (tempFile.getPath().equalsIgnoreCase(platformId.getPath())) {\r
+                return fdb.getPlatformList().getFilenameArray(index).getFarGuid();\r
+            }\r
+        }\r
+\r
+        return null;\r
+    }\r
+\r
+    public String getModuleFarGuid(Identification moduleId) {\r
+        PackageIdentification packageId = getPackageIdByModuleId(moduleId);\r
+        if (packageId != null) {\r
+            return getPackageFarGuid(packageId);\r
+        } else {\r
+            return null;\r
         }\r
     }\r
 \r
@@ -80,19 +212,50 @@ public class WorkspaceTools {
             MsaFiles files = OpenFile.openSpdFile(path).getMsaFiles();\r
             if (files != null) {\r
                 for (int index = 0; index < files.getFilenameList().size(); index++) {\r
-                    modulePath.addElement(files.getFilenameList().get(index));\r
+                    String msaPath = files.getFilenameList().get(index);\r
+                    msaPath = Tools.addFileSeparator(Tools.getFilePathOnly(path)) + msaPath;\r
+                    msaPath = Tools.convertPathToCurrentOsType(msaPath);\r
+                    modulePath.addElement(msaPath);\r
                 }\r
             }\r
         } catch (IOException e) {\r
-            e.printStackTrace();\r
+\r
         } catch (XmlException e) {\r
-            e.printStackTrace();\r
+\r
         } catch (Exception e) {\r
-            e.printStackTrace();\r
+\r
         }\r
         return modulePath;\r
     }\r
 \r
+    /**\r
+     Get all Industry Std Includes' paths from one package\r
+     \r
+     @return a Vector with all paths\r
+     \r
+     **/\r
+    public Vector<String> getAllIndustryStdIncludesOfPackage(String path) {\r
+        Vector<String> includePath = new Vector<String>();\r
+        try {\r
+            IndustryStdIncludes files = OpenFile.openSpdFile(path).getIndustryStdIncludes();\r
+            if (files != null) {\r
+                for (int index = 0; index < files.getIndustryStdHeaderList().size(); index++) {\r
+                    String temp = files.getIndustryStdHeaderList().get(index).getIncludeHeader();\r
+                    temp = Tools.addFileSeparator(Tools.getFilePathOnly(path)) + temp;\r
+                    temp = Tools.convertPathToCurrentOsType(temp);\r
+                    includePath.addElement(temp);\r
+                }\r
+            }\r
+        } catch (IOException e) {\r
+\r
+        } catch (XmlException e) {\r
+\r
+        } catch (Exception e) {\r
+\r
+        }\r
+        return includePath;\r
+    }\r
+\r
     /**\r
      Get all package basic information form the FrameworkDatabase.db file\r
      \r
@@ -114,22 +277,124 @@ public class WorkspaceTools {
                 vPackageList.addElement(new PackageIdentification(id));\r
             } catch (IOException e) {\r
                 Log.err("Open Package Surface Area " + path, e.getMessage());\r
-                e.printStackTrace();\r
+\r
             } catch (XmlException e) {\r
                 Log.err("Open Package Surface Area " + path, e.getMessage());\r
-                e.printStackTrace();\r
+\r
             } catch (Exception e) {\r
                 Log.err("Open Package Surface Area " + path, "Invalid file type");\r
-                e.printStackTrace();\r
+\r
             }\r
         }\r
+        Sort.sortPackages(vPackageList, DataType.SORT_TYPE_ASCENDING);\r
         return vPackageList;\r
     }\r
 \r
+    public Vector<FarIdentification> getAllFars() {\r
+        openFrameworkDb();\r
+        Vector<FarIdentification> v = new Vector<FarIdentification>();\r
+        for (int index = 0; index < fdb.getFarList().getFilenameList().size(); index++) {\r
+            DbPathAndFilename item = fdb.getFarList().getFilenameList().get(index);\r
+            FarIdentification far = new FarIdentification(item.getFarGuid(), item.getMd5Sum(), item.getStringValue());\r
+            v.addElement(far);\r
+        }\r
+        return v;\r
+    }\r
+\r
+    public Vector<PackageIdentification> getPackagesByFar(FarIdentification far) {\r
+        Identification id = null;\r
+        openFrameworkDb();\r
+        Vector<PackageIdentification> v = new Vector<PackageIdentification>();\r
+\r
+        for (int index = 0; index < fdb.getPackageList().getFilenameList().size(); index++) {\r
+            DbPathAndFilename item = fdb.getPackageList().getFilenameArray(index);\r
+            String path = Workspace.getCurrentWorkspace() + DataType.FILE_SEPARATOR + item.getStringValue();\r
+            path = Tools.convertPathToCurrentOsType(path);\r
+\r
+            if (item.getFarGuid() != null && item.getFarGuid().equalsIgnoreCase(far.getGuid())) {\r
+\r
+                try {\r
+                    id = getId(path, OpenFile.openSpdFile(path));\r
+                    v.addElement(new PackageIdentification(id));\r
+                } catch (IOException e) {\r
+                    Log.err("Open Package Surface Area " + path, e.getMessage());\r
+                    e.printStackTrace();\r
+                } catch (XmlException e) {\r
+                    Log.err("Open Package Surface Area " + path, e.getMessage());\r
+                    e.printStackTrace();\r
+                } catch (Exception e) {\r
+                    Log.err("Open Package Surface Area " + path, "Invalid file type");\r
+                    e.printStackTrace();\r
+                }\r
+            }\r
+        }\r
+        return v;\r
+    }\r
+\r
+    public Vector<PlatformIdentification> getPlatformsByFar(FarIdentification far) {\r
+        Identification id = null;\r
+        openFrameworkDb();\r
+        Vector<PlatformIdentification> v = new Vector<PlatformIdentification>();\r
+\r
+        for (int index = 0; index < fdb.getPlatformList().getFilenameList().size(); index++) {\r
+            DbPathAndFilename item = fdb.getPlatformList().getFilenameArray(index);\r
+            String path = Workspace.getCurrentWorkspace() + DataType.FILE_SEPARATOR + item.getStringValue();\r
+            path = Tools.convertPathToCurrentOsType(path);\r
+\r
+            if (item.getFarGuid() != null && item.getFarGuid().equalsIgnoreCase(far.getGuid())) {\r
+                try {\r
+                    id = getId(path, OpenFile.openFpdFile(path));\r
+                    v.addElement(new PlatformIdentification(id));\r
+                } catch (IOException e) {\r
+                    Log.err("Open Platform Surface Area " + path, e.getMessage());\r
+                    e.printStackTrace();\r
+                } catch (XmlException e) {\r
+                    Log.err("Open Platform Surface Area " + path, e.getMessage());\r
+                    e.printStackTrace();\r
+                } catch (Exception e) {\r
+                    Log.err("Open Platform Surface Area " + path, "Invalid file type");\r
+                    e.printStackTrace();\r
+                }\r
+            }\r
+        }\r
+        return v;\r
+    }\r
+\r
     /**\r
-     Get all package basic information form the FrameworkDatabase.db file\r
+     Get all module basic information from a package\r
      \r
-     @return vPackageList A vector includes all packages' basic information\r
+     @param id Package id\r
+     @return A vector includes all modules' basic information\r
+     \r
+     **/\r
+    public Vector<ModuleIdentification> getAllModules(PackageIdentification pid) {\r
+        Vector<ModuleIdentification> v = new Vector<ModuleIdentification>();\r
+        Vector<String> modulePaths = this.getAllModulesOfPackage(pid.getPath());\r
+        Identification id = null;\r
+        String modulePath = null;\r
+\r
+        for (int index = 0; index < modulePaths.size(); index++) {\r
+            try {\r
+                modulePath = modulePaths.get(index);\r
+                id = getId(modulePath, OpenFile.openMsaFile(modulePath));\r
+            } catch (IOException e) {\r
+                Log.log("Error when Open Module Surface Area " + modulePath, e.getMessage());\r
+            } catch (XmlException e) {\r
+                Log.log("Error when Open Module Surface Area " + modulePath, e.getMessage());\r
+            } catch (Exception e) {\r
+                Log.log("Error when Open Module Surface Area " + modulePath, "Invalid file type " + e.getMessage());\r
+            }\r
+            v.addElement(new ModuleIdentification(id, pid));\r
+        }\r
+        Sort.sortModules(v, DataType.SORT_TYPE_ASCENDING);\r
+        return v;\r
+\r
+    }\r
+\r
+    /**\r
+     Get all module basic information form the FrameworkDatabase.db file\r
+     \r
+     @return vModuleList A vector includes all modules' basic information\r
      \r
      */\r
     public Vector<ModuleIdentification> getAllModules() {\r
@@ -149,26 +414,22 @@ public class WorkspaceTools {
         for (int indexI = 0; indexI < vPackageList.size(); indexI++) {\r
             packagePath = vPackageList.elementAt(indexI).getPath();\r
             modulePaths = this.getAllModulesOfPackage(packagePath);\r
-            packagePath = packagePath.substring(0, packagePath.lastIndexOf(DataType.FILE_SEPARATOR)\r
-                                                   + DataType.FILE_SEPARATOR.length());\r
+\r
             for (int indexJ = 0; indexJ < modulePaths.size(); indexJ++) {\r
-                modulePath = Tools.convertPathToCurrentOsType(packagePath + modulePaths.elementAt(indexJ));\r
                 try {\r
+                    modulePath = modulePaths.get(indexJ);\r
                     id = getId(modulePath, OpenFile.openMsaFile(modulePath));\r
                     vModuleList.addElement(new ModuleIdentification(id, vPackageList.elementAt(indexI)));\r
                 } catch (IOException e) {\r
                     Log.err("Open Module Surface Area " + modulePath, e.getMessage());\r
-                    e.printStackTrace();\r
                 } catch (XmlException e) {\r
                     Log.err("Open Module Surface Area " + modulePath, e.getMessage());\r
-                    e.printStackTrace();\r
                 } catch (Exception e) {\r
                     Log.err("Open Module Surface Area " + modulePath, "Invalid file type");\r
-                    e.printStackTrace();\r
                 }\r
             }\r
         }\r
-\r
+        Sort.sortModules(vModuleList, DataType.SORT_TYPE_ASCENDING);\r
         return vModuleList;\r
     }\r
 \r
@@ -193,15 +454,13 @@ public class WorkspaceTools {
                 vPlatformList.addElement(new PlatformIdentification(id));\r
             } catch (IOException e) {\r
                 Log.err("Open Platform Surface Area " + path, e.getMessage());\r
-                e.printStackTrace();\r
             } catch (XmlException e) {\r
                 Log.err("Open Platform Surface Area " + path, e.getMessage());\r
-                e.printStackTrace();\r
             } catch (Exception e) {\r
                 Log.err("Open Platform Surface Area " + path, "Invalid file type");\r
-                e.printStackTrace();\r
             }\r
         }\r
+        Sort.sortPlatforms(vPlatformList, DataType.SORT_TYPE_ASCENDING);\r
         return vPlatformList;\r
     }\r
 \r
@@ -219,6 +478,7 @@ public class WorkspaceTools {
                 }\r
             }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -236,6 +496,7 @@ public class WorkspaceTools {
                 }\r
             }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -251,8 +512,9 @@ public class WorkspaceTools {
                 for (int index = 0; index < spd.getPpiDeclarations().getEntryList().size(); index++) {\r
                     vector.addElement(spd.getPpiDeclarations().getEntryList().get(index).getCName());\r
                 }\r
-            }    \r
+            }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -268,8 +530,9 @@ public class WorkspaceTools {
                 for (int index = 0; index < spd.getGuidDeclarations().getEntryList().size(); index++) {\r
                     vector.addElement(spd.getGuidDeclarations().getEntryList().get(index).getCName());\r
                 }\r
-            }    \r
+            }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -278,15 +541,22 @@ public class WorkspaceTools {
      \r
      @return Vector\r
      **/\r
-    public Vector<String> getAllPcdDeclarationsFromPackage(PackageSurfaceArea spd) {\r
-        Vector<String> vector = new Vector<String>();\r
+    public PcdVector getAllPcdDeclarationsFromPackage(PackageSurfaceArea spd) {\r
+        PcdVector vector = new PcdVector();\r
         if (spd.getPcdDeclarations() != null) {\r
             if (spd.getPcdDeclarations().getPcdEntryList().size() > 0) {\r
                 for (int index = 0; index < spd.getPcdDeclarations().getPcdEntryList().size(); index++) {\r
-                    vector.addElement(spd.getPcdDeclarations().getPcdEntryList().get(index).getCName());\r
+                    String name = spd.getPcdDeclarations().getPcdEntryList().get(index).getCName();\r
+                    String guidCName = spd.getPcdDeclarations().getPcdEntryList().get(index).getTokenSpaceGuidCName();\r
+                    String help = spd.getPcdDeclarations().getPcdEntryList().get(index).getHelpText();\r
+                    Vector<String> type = Tools.convertListToVector(spd.getPcdDeclarations().getPcdEntryList()\r
+                                                                       .get(index).getValidUsage());\r
+\r
+                    vector.addPcd(new PcdIdentification(name, guidCName, help, type));\r
                 }\r
-            }            \r
+            }\r
         }\r
+        Sort.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -308,15 +578,13 @@ public class WorkspaceTools {
                 }\r
             } catch (IOException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (XmlException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (Exception e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -336,15 +604,13 @@ public class WorkspaceTools {
                 }\r
             } catch (IOException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (XmlException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (Exception e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -364,15 +630,13 @@ public class WorkspaceTools {
                 }\r
             } catch (IOException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (XmlException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (Exception e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -392,43 +656,38 @@ public class WorkspaceTools {
                 }\r
             } catch (IOException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (XmlException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (Exception e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             }\r
         }\r
+        Sort.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
-    public Vector<String> getAllPcdDeclarationsFromWorkspace() {\r
+    public PcdVector getAllPcdDeclarationsFromWorkspace() {\r
         //\r
         // First get all packages\r
         //\r
         this.getAllPackages();\r
 \r
-        Vector<String> vector = new Vector<String>();\r
+        PcdVector vector = new PcdVector();\r
         for (int index = 0; index < this.vPackageList.size(); index++) {\r
             try {\r
-                Vector<String> v = getAllPcdDeclarationsFromPackage(OpenFile.openSpdFile(vPackageList.get(index)\r
-                                                                                                     .getPath()));\r
+                PcdVector v = getAllPcdDeclarationsFromPackage(OpenFile.openSpdFile(vPackageList.get(index).getPath()));\r
                 if (v != null && v.size() > 0) {\r
                     vector.addAll(v);\r
                 }\r
             } catch (IOException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (XmlException e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             } catch (Exception e) {\r
                 // TODO Auto-generated catch block\r
-                e.printStackTrace();\r
             }\r
         }\r
+        Sort.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r
         return vector;\r
     }\r
 \r
@@ -452,10 +711,8 @@ public class WorkspaceTools {
         for (int indexI = 0; indexI < vPackageList.size(); indexI++) {\r
             packagePath = vPackageList.elementAt(indexI).getPath();\r
             modulePaths = this.getAllModulesOfPackage(packagePath);\r
-            packagePath = packagePath.substring(0, packagePath.lastIndexOf(DataType.FILE_SEPARATOR)\r
-                                                   + DataType.FILE_SEPARATOR.length());\r
             for (int indexJ = 0; indexJ < modulePaths.size(); indexJ++) {\r
-                modulePath = Tools.convertPathToCurrentOsType(packagePath + modulePaths.elementAt(indexJ));\r
+                modulePath = modulePaths.get(indexJ);\r
                 try {\r
                     mid = getId(modulePath, OpenFile.openMsaFile(modulePath));\r
                     //\r
@@ -465,11 +722,11 @@ public class WorkspaceTools {
                         return vPackageList.elementAt(indexI);\r
                     }\r
                 } catch (IOException e) {\r
-                    e.printStackTrace();\r
+\r
                 } catch (XmlException e) {\r
-                    e.printStackTrace();\r
+\r
                 } catch (Exception e) {\r
-                    e.printStackTrace();\r
+\r
                 }\r
             }\r
         }\r
@@ -571,4 +828,78 @@ public class WorkspaceTools {
         strFrameworkDbFilePath = Tools.convertPathToCurrentOsType(strFrameworkDbFilePath);\r
         SaveFile.saveDbFile(strFrameworkDbFilePath, fdb);\r
     }\r
+\r
+    /**\r
+     Get all file's path from one module\r
+     \r
+     @param path\r
+     @return\r
+     @throws IOException\r
+     @throws XmlException\r
+     @throws Exception\r
+     \r
+     **/\r
+    public Vector<String> getAllModuleFilesPath(String path) throws IOException, XmlException, Exception {\r
+        Vector<String> v = new Vector<String>();\r
+        path = Tools.convertPathToCurrentOsType(path);\r
+        v.addElement(path);\r
+        ModuleSurfaceArea msa = OpenFile.openMsaFile(path);\r
+        if (msa != null) {\r
+            //\r
+            // Get all files' path of a module\r
+            //\r
+            SourceFiles sf = msa.getSourceFiles();\r
+            if (sf != null) {\r
+                for (int index = 0; index < sf.getFilenameList().size(); index++) {\r
+                    String temp = sf.getFilenameList().get(index).getStringValue();\r
+                    temp = Tools.addFileSeparator(Tools.getFilePathOnly(path)) + temp;\r
+                    v.addElement(Tools.convertPathToCurrentOsType(temp));\r
+                }\r
+            }\r
+        }\r
+\r
+        return v;\r
+    }\r
+\r
+    /**\r
+     Get all file's path from one package\r
+     \r
+     @param path\r
+     @return\r
+     @throws IOException\r
+     @throws XmlException\r
+     @throws Exception\r
+     \r
+     **/\r
+    public Vector<String> getAllPakcageFilesPath(String path) throws IOException, XmlException, Exception {\r
+        Vector<String> v = new Vector<String>();\r
+        path = Tools.convertPathToCurrentOsType(path);\r
+        //\r
+        // First add package\r
+        //\r
+        v.addElement(path);\r
+\r
+        //\r
+        // Add the package's industry std includes one by one\r
+        //\r
+        Vector<String> f1 = new Vector<String>();\r
+        f1 = getAllIndustryStdIncludesOfPackage(path);\r
+        for (int index = 0; index < f1.size(); index++) {\r
+            v.addElement(f1.get(index));\r
+        }\r
+\r
+        //\r
+        // Add module's files one by one\r
+        //\r
+        f1 = new Vector<String>();\r
+        f1 = getAllModulesOfPackage(path);\r
+        for (int indexI = 0; indexI < f1.size(); indexI++) {\r
+            Vector<String> f2 = getAllModuleFilesPath(f1.get(indexI));\r
+            for (int indexJ = 0; indexJ < f2.size(); indexJ++) {\r
+                v.addElement(f2.get(indexJ));\r
+            }\r
+        }\r
+\r
+        return v;\r
+    }\r
 }\r