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
\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
- Tools.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
+ Tools.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r
return vector;\r
}\r
\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
// TODO Auto-generated catch block\r
}\r
}\r
- Tools.sortVectorString(vector, DataType.SORT_TYPE_ASCENDING);\r
+ Tools.sortPcds(vector, DataType.SORT_TYPE_ASCENDING);\r
return vector;\r
}\r
\r