import org.tianocore.UserExtensionsDocument;\r
import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r
import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
-import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
-import org.tianocore.frameworkwizard.platform.ui.id.PackageIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
+import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
\r
/**\r
This class processes fpd file contents such as add remove xml elements. \r
public class FpdFileContents {\r
\r
static final String xmlNs = "http://www.TianoCore.org/2006/Edk2.0";\r
+ static final String regExpNewLineAndSpaces = "((\n)|(\r\n)|(\r)|(\u0085)|(\u2028)|(\u2029))(\\s)*";\r
\r
private PlatformSurfaceAreaDocument fpdd = null;\r
\r
\r
private HashMap<String, String> defaultPcdValue = new HashMap<String, String>();\r
\r
+ private String itemType (String pcdInfo) {\r
+ \r
+ return pcdInfo.substring(pcdInfo.lastIndexOf(" ") + 1);\r
+ }\r
+ \r
/**\r
* look through all pcd data in all ModuleSA, create pcd -> ModuleSA mappings.\r
*/\r
return fpdFrameworkModules;\r
}\r
\r
+ public void getFrameworkModuleSAByFvBinding (String fvName, Vector<String[]> vGuid) {\r
+ if (getFrameworkModulesCount() == 0){\r
+ return;\r
+ }\r
+ \r
+ ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
+ while(li.hasNext()) {\r
+ ModuleSADocument.ModuleSA moduleSa = (ModuleSADocument.ModuleSA)li.next();\r
+ if (moduleSa.getModuleSaBuildOptions() == null) {\r
+ continue;\r
+ }\r
+ String fvBinding = moduleSa.getModuleSaBuildOptions().getFvBinding();\r
+ if (fvBinding == null) {\r
+ continue;\r
+ }\r
+ \r
+ String[] fvNames = fvBinding.split(" ");\r
+ for (int i = 0; i < fvNames.length; ++i) {\r
+ //\r
+ // BugBug : underscore "_" should not be replaced!!! \r
+ // But Fv name FVMAIN from fdf file not consist with FV_MAIN in fpd file.\r
+ //\r
+ if (fvNames[i].equals(fvName) || fvNames[i].replaceAll("_", "").equals(fvName)) {\r
+ String[] sa = new String[] {moduleSa.getModuleGuid(), moduleSa.getModuleVersion(),\r
+ moduleSa.getPackageGuid(), moduleSa.getPackageVersion(), \r
+ listToString(moduleSa.getSupArchList())};\r
+ vGuid.add(sa);\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ \r
public int getFrameworkModulesCount() {\r
if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
removeElement(getfpdFrameworkModules());\r
ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
int i = 0;\r
while(li.hasNext()) {\r
- ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();\r
- saa[i][0] = msa.getModuleGuid();\r
- saa[i][1] = msa.getModuleVersion();\r
+ ModuleSADocument.ModuleSA moduleSa = (ModuleSADocument.ModuleSA)li.next();\r
+ saa[i][0] = moduleSa.getModuleGuid();\r
+ saa[i][1] = moduleSa.getModuleVersion();\r
\r
- saa[i][2] = msa.getPackageGuid();\r
- saa[i][3] = msa.getPackageVersion();\r
- saa[i][4] = listToString(msa.getSupArchList());\r
+ saa[i][2] = moduleSa.getPackageGuid();\r
+ saa[i][3] = moduleSa.getPackageVersion();\r
+ saa[i][4] = listToString(moduleSa.getSupArchList());\r
++i;\r
}\r
}\r
}\r
\r
public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
- String[] s = key.split(" ");\r
+ \r
if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r
removeElement(getfpdFrameworkModules());\r
fpdFrameworkModules = null;\r
return null;\r
}\r
+ String[] s = key.split(" ");\r
+ String archsInKey = "";\r
+ if (s.length > 4) {\r
+ for (int i = 4; i < s.length; ++i) {\r
+ archsInKey += s[i];\r
+ archsInKey += " ";\r
+ }\r
+ archsInKey = archsInKey.trim();\r
+ }\r
+ \r
ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();\r
while(li.hasNext()) {\r
ModuleSADocument.ModuleSA moduleSa = (ModuleSADocument.ModuleSA)li.next();\r
continue;\r
}\r
}\r
- //ToDo add arch check for s[4]\r
+ //ToDo add arch check .\r
if (moduleSa.getSupArchList() != null) {\r
- if (!listToString(moduleSa.getSupArchList()).equals(s[4])) {\r
- continue;\r
+ if (listToString(moduleSa.getSupArchList()).equals(archsInKey)) {\r
+ return moduleSa;\r
+ }\r
+ }\r
+ else {\r
+ if (archsInKey.length() == 0) {\r
+ return moduleSa;\r
}\r
}\r
- return moduleSa;\r
}\r
}\r
return null;\r
}\r
\r
cursor.push();\r
- cursor.toPrevToken();\r
+ while (cursor.hasPrevToken()) {\r
+ cursor.toPrevToken();\r
+ if (!cursor.isText()) {\r
+ break;\r
+ }\r
+ String s = cursor.getTextValue();\r
+ if (s.matches(regExpNewLineAndSpaces)) {\r
+ continue;\r
+ }\r
+ }\r
+\r
if (cursor.isComment()) {\r
cursor.removeXml();\r
}\r
+ \r
cursor.pop();\r
cursor.removeXml();\r
if (getFrameworkModulesCount() == 0) {\r
getLibraryInstances(moduleKey, saaLib);\r
ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
+ //\r
+ // create vector for module & library instance MIs.\r
+ //\r
vMi.add(mi);\r
- try {\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 = WorkspaceProfile.getModuleId(libKey);\r
+ vMi.add(libMi);\r
+ }\r
+ \r
nextPcd:for (int i = 0; i < saaModuleSaPcd.length; ++i) {\r
- if (WorkspaceProfile.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 = WorkspaceProfile.getModuleId(libKey);\r
- vMi.add(libMi);\r
- if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], libMi)) {\r
+\r
+ for (int j = 0; j < vMi.size(); ++j) {\r
+ ModuleIdentification nextMi = vMi.get(j);\r
+ if (WorkspaceProfile.pcdInMsa(saaModuleSaPcd[i][0], saaModuleSaPcd[i][1], nextMi)) {\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
+ for (int i = 0; i < vMi.size(); ++i) {\r
ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea) WorkspaceProfile\r
.getModuleXmlObject(vMi\r
.get(i));\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, vMi.get(i));\r
PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = LookupPcdDeclaration(msaPcd, depPkgs);\r
if (spdPcd == null) {\r
}\r
\r
}\r
- }\r
- catch (Exception e){\r
- throw e;\r
- }\r
\r
return dataModified;\r
}\r
do {\r
PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData)cursor.getObject();\r
if (pcdData.getCName().equals(cName) && pcdData.getTokenSpaceGuidCName().equals(tsGuid)) {\r
+ //\r
+ // change item type while not updating dynPcdData????\r
+ //\r
pcdData.setItemType(PcdItemTypes.Enum.forString(itemType));\r
if(pcdData.getDatumType().equals("VOID*")) {\r
pcdData.setMaxDatumSize(new Integer(maxSize));\r
//\r
sa[0] = spdPcd.getHelpText() + msaPcd.getHelpText();\r
sa[1] = msaPcd.getPcdItemType()+"";\r
+ sa[2] = msa.getModuleDefinitions().getBinaryModule()+"";\r
return true;\r
}\r
\r
return false;\r
}\r
\r
+ private boolean multiSourcePcd (String cName, String tsGuidCName, String moduleKey) {\r
+ int libCount = getLibraryInstancesCount(moduleKey);\r
+ String[][] saaLib = new String[libCount][5];\r
+ getLibraryInstances(moduleKey, saaLib);\r
+ ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
+ Vector<ModuleIdentification> vMi = new Vector<ModuleIdentification>();\r
+ //\r
+ // create vector for module & library instance MIs.\r
+ //\r
+ vMi.add(mi);\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 = WorkspaceProfile.getModuleId(libKey);\r
+ vMi.add(libMi);\r
+ }\r
+ \r
+ int pcdSourceCount = 0;\r
+ for (int i = 0; i < vMi.size(); ++i) {\r
+ if (WorkspaceProfile.pcdInMsa(cName, tsGuidCName, vMi.get(i))) {\r
+ pcdSourceCount++;\r
+ }\r
+ }\r
+ \r
+ if (pcdSourceCount < 2) {\r
+ return false;\r
+ }\r
+ else {\r
+ return true;\r
+ }\r
+ \r
+ }\r
+ \r
/**Remove PCDBuildDefinition entries from ModuleSA\r
* @param moduleKey identifier of ModuleSA.\r
* @param consumer where these entries come from.\r
*/\r
public void removePcdData(String moduleKey, ModuleIdentification consumer) {\r
- try {\r
+ \r
ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = (ModuleSurfaceAreaDocument.ModuleSurfaceArea)WorkspaceProfile.getModuleXmlObject(consumer);\r
if (msa.getPcdCoded() == null) {\r
return;\r
ModuleSADocument.ModuleSA moduleSA = getModuleSA(moduleKey);\r
if (moduleSA.getPcdBuildDefinition() != null) {\r
XmlCursor cursor = moduleSA.getPcdBuildDefinition().newCursor();\r
+ cursor.push();\r
if (cursor.toFirstChild()) {\r
- PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData) cursor\r
- .getObject();\r
- if (msaPcd.getCName().equals(pcdData.getCName())\r
- && msaPcd.getTokenSpaceGuidCName().equals(pcdData.getTokenSpaceGuidCName())) {\r
+ do {\r
+ PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData) cursor\r
+ .getObject();\r
+ String cName = msaPcd.getCName();\r
+ String tsGuidCName = msaPcd.getTokenSpaceGuidCName();\r
+ if (cName.equals(pcdData.getCName())\r
+ && tsGuidCName.equals(pcdData.getTokenSpaceGuidCName()) && !multiSourcePcd(cName, tsGuidCName, moduleKey)) {\r
\r
- maintainDynPcdMap(pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName(), moduleKey);\r
- cursor.removeXml();\r
- break;\r
- }\r
- while (cursor.toNextSibling()) {\r
- pcdData = (PcdBuildDefinitionDocument.PcdBuildDefinition.PcdData) cursor.getObject();\r
- if (msaPcd.getCName().equals(pcdData.getCName())\r
- && msaPcd.getTokenSpaceGuidCName().equals(pcdData.getTokenSpaceGuidCName())) {\r
maintainDynPcdMap(pcdData.getCName() + " " + pcdData.getTokenSpaceGuidCName(),\r
moduleKey);\r
cursor.removeXml();\r
break;\r
}\r
- }\r
+ } while (cursor.toNextSibling());\r
+ }\r
+ \r
+ cursor.pop();\r
+ if (moduleSA.getPcdBuildDefinition().getPcdDataList().size() == 0) {\r
+ cursor.removeXml();\r
}\r
cursor.dispose();\r
}\r
}\r
- \r
- }\r
- catch (Exception e){\r
- e.printStackTrace();\r
- \r
- }\r
+ \r
}\r
//\r
// key for ModuleSA : "ModuleGuid ModuleVer PackageGuid PackageVer Arch"\r
cursor.toNextSibling();\r
}\r
cursor.push();\r
- cursor.toPrevToken();\r
+ while (cursor.hasPrevToken()) {\r
+ cursor.toPrevToken();\r
+ if (!cursor.isText()) {\r
+ break;\r
+ }\r
+ String s = cursor.getTextValue();\r
+ if (s.matches(regExpNewLineAndSpaces)) {\r
+ continue;\r
+ }\r
+ }\r
+ \r
if (cursor.isComment()) {\r
cursor.removeXml();\r
}\r
String mn = libMi.getName();\r
String mg = libMi.getGuid();\r
String mv = libMi.getVersion();\r
- String pn = libMi.getPackage().getName();\r
- String pg = libMi.getPackage().getGuid();\r
- String pv = libMi.getPackage().getVersion();\r
+ String pn = libMi.getPackageId().getName();\r
+ String pg = libMi.getPackageId().getGuid();\r
+ String pv = libMi.getPackageId().getVersion();\r
LibrariesDocument.Libraries.Instance instance = libs.addNewInstance();\r
XmlCursor cursor = instance.newCursor();\r
try{\r
String comment = "Pkg: " + pn + " Mod: " + mn \r
- + " Path: " + WorkspaceProfile.getMsaFile(libMi).getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
+ + " Path: " + libMi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
cursor.insertComment(comment);\r
}\r
catch (Exception e){\r
}\r
\r
public String getFvBinding(String moduleKey){\r
- ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
- if (msa == null || msa.getModuleSaBuildOptions() == null) {\r
+ ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
+ return getFvBinding (moduleSa);\r
+ }\r
+ \r
+ public String getFvBinding (ModuleSADocument.ModuleSA moduleSa) {\r
+ if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null) {\r
return null;\r
}\r
- return msa.getModuleSaBuildOptions().getFvBinding();\r
+ return moduleSa.getModuleSaBuildOptions().getFvBinding();\r
+ }\r
+ \r
+ public void setFvBinding(ModuleSADocument.ModuleSA moduleSa, String fvBinding) {\r
+ if (moduleSa == null ) {\r
+ return;\r
+ }\r
+ if (fvBinding == null || fvBinding.length() == 0) {\r
+ if(moduleSa.getModuleSaBuildOptions() != null){\r
+ moduleSa.getModuleSaBuildOptions().unsetFvBinding();\r
+ }\r
+ }\r
+ else {\r
+ if(moduleSa.getModuleSaBuildOptions() == null){\r
+ moduleSa.addNewModuleSaBuildOptions().setFvBinding(fvBinding);\r
+ return;\r
+ }\r
+ moduleSa.getModuleSaBuildOptions().setFvBinding(fvBinding);\r
+ }\r
}\r
\r
public void setFvBinding(String moduleKey, String fvBinding){\r
- ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
- if (msa == null ) {\r
+ ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
+ setFvBinding (moduleSa, fvBinding);\r
+ }\r
+ \r
+ private int fvBindingForModuleSA (ModuleSADocument.ModuleSA moduleSa, String fvName) {\r
+ if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null || moduleSa.getModuleSaBuildOptions().getFvBinding() == null) {\r
+ return -1;\r
+ }\r
+ \r
+ String fvNameList = moduleSa.getModuleSaBuildOptions().getFvBinding();\r
+ String[] fvNamesArray = fvNameList.split(" ");\r
+ int occursAt = -1;\r
+ for (int i = 0; i < fvNamesArray.length; ++i) {\r
+ if (fvNamesArray[i].equals(fvName)) {\r
+ occursAt = i;\r
+ break;\r
+ }\r
+ }\r
+ return occursAt;\r
+ }\r
+ \r
+ public void removeFvBinding (ModuleSADocument.ModuleSA moduleSa, String fvName) {\r
+ if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null || moduleSa.getModuleSaBuildOptions().getFvBinding() == null) {\r
return;\r
}\r
- if(msa.getModuleSaBuildOptions() == null){\r
- msa.addNewModuleSaBuildOptions().setFvBinding(fvBinding);\r
+ \r
+ String fvNameList = moduleSa.getModuleSaBuildOptions().getFvBinding();\r
+ String[] fvNamesArray = fvNameList.split(" ");\r
+ int occursAt = -1;\r
+ for (int i = 0; i < fvNamesArray.length; ++i) {\r
+ if (fvNamesArray[i].equals(fvName)) {\r
+ occursAt = i;\r
+ break;\r
+ }\r
+ }\r
+ // jump over where the input fvName occurs in the original Fv list.\r
+ if (occursAt != -1) {\r
+ String newFvNameList = " ";\r
+ for (int i = 0; i < fvNamesArray.length; ++i) {\r
+ if (i == occursAt) {\r
+ continue;\r
+ }\r
+ newFvNameList += fvNamesArray[i];\r
+ }\r
+ setFvBinding (moduleSa, newFvNameList.trim());\r
+ }\r
+\r
+ }\r
+ \r
+ /**\r
+ * @param fvName The FV name that to be removed from FvBinding List.\r
+ */\r
+ public void removeFvBindingAll (String fvName) {\r
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
+ removeElement(getfpdFrameworkModules());\r
+ fpdFrameworkModules = null;\r
+ return;\r
+ }\r
+ \r
+ Iterator<ModuleSADocument.ModuleSA> li = getfpdFrameworkModules().getModuleSAList().iterator();\r
+ while (li.hasNext()) {\r
+ ModuleSADocument.ModuleSA moduleSa = li.next();\r
+ removeFvBinding (moduleSa, fvName); \r
+ }\r
+ }\r
+ \r
+ public void appendFvBindingAll (String fvName) {\r
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
+ removeElement(getfpdFrameworkModules());\r
+ fpdFrameworkModules = null;\r
+ return;\r
+ }\r
+ \r
+ Iterator<ModuleSADocument.ModuleSA> li = getfpdFrameworkModules().getModuleSAList().iterator();\r
+ while (li.hasNext()) {\r
+ ModuleSADocument.ModuleSA moduleSa = li.next();\r
+ appendFvBinding (moduleSa, fvName); \r
+ }\r
+ }\r
+ \r
+ public void appendFvBindingFor (String oldFvName, String newFvName) {\r
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r
+ removeElement(getfpdFrameworkModules());\r
+ fpdFrameworkModules = null;\r
+ return;\r
+ }\r
+ \r
+ Iterator<ModuleSADocument.ModuleSA> li = getfpdFrameworkModules().getModuleSAList().iterator();\r
+ while (li.hasNext()) {\r
+ ModuleSADocument.ModuleSA moduleSa = li.next();\r
+ String fvBinding = getFvBinding (moduleSa);\r
+ if (fvBinding != null && fvBindingForModuleSA (moduleSa, oldFvName) >= 0) {\r
+ appendFvBinding (moduleSa, newFvName); \r
+ }\r
+ }\r
+ }\r
+ \r
+ public void appendFvBinding (String moduleKey, String fvName) {\r
+ ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
+ appendFvBinding (moduleSa, fvName);\r
+ }\r
+ \r
+ public void appendFvBinding (ModuleSADocument.ModuleSA moduleSa, String fvName) {\r
+ if (moduleSa == null) {\r
+ return;\r
+ }\r
+ \r
+ if (moduleSa.getModuleSaBuildOptions() == null || moduleSa.getModuleSaBuildOptions().getFvBinding() == null) {\r
+ setFvBinding(moduleSa, fvName);\r
return;\r
}\r
- msa.getModuleSaBuildOptions().setFvBinding(fvBinding);\r
+ \r
+ String fvNameList = moduleSa.getModuleSaBuildOptions().getFvBinding();\r
+ String newFvNameList = fvNameList + " " + fvName;\r
+ setFvBinding (moduleSa, newFvNameList.trim());\r
+ }\r
+ \r
+ public void updateFvBindingInModuleSA (String moduleKey, String fvName) {\r
+ \r
+ appendFvBinding (moduleKey, fvName);\r
}\r
\r
public String getFfsFileNameGuid(String moduleKey){\r
- ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);\r
- if (msa == null || msa.getModuleSaBuildOptions() == null) {\r
+ ModuleSADocument.ModuleSA moduleSa = getModuleSA(moduleKey);\r
+ if (moduleSa == null || moduleSa.getModuleSaBuildOptions() == null) {\r
return null;\r
}\r
- return msa.getModuleSaBuildOptions().getFfsFileNameGuid();\r
+ return moduleSa.getModuleSaBuildOptions().getFfsFileNameGuid();\r
}\r
\r
public void setFfsFileNameGuid(String moduleKey, String fileGuid){\r
\r
if (opt.getSupArchList() != null){\r
saa[i][4] = listToString(opt.getSupArchList());\r
-\r
+ }\r
+ else {\r
+ saa[i][4] = "";\r
}\r
\r
saa[i][5] = opt.getStringValue();\r
\r
private PcdDeclarationsDocument.PcdDeclarations.PcdEntry LookupPcdDeclaration (PcdCodedDocument.PcdCoded.PcdEntry msaPcd, PackageIdentification[] depPkgs) {\r
\r
- Map<String, XmlObject> m = new HashMap<String, XmlObject>();\r
PcdDeclarationsDocument.PcdDeclarations.PcdEntry spdPcd = null;\r
for (int i = 0; i < depPkgs.length; ++i) {\r
- m.put("PackageSurfaceArea", WorkspaceProfile.getPackageXmlObject(depPkgs[i]));\r
- SurfaceAreaQuery.setDoc(m);\r
- XmlObject[] xo = SurfaceAreaQuery.getSpdPcdDeclarations();\r
+\r
+ XmlObject[] xo = SurfaceAreaQuery.getSpdPcdDeclarations(depPkgs[i]);\r
if (xo == null) {\r
continue;\r
}\r
ModuleSADocument.ModuleSA msa = getfpdFrameworkModules().addNewModuleSA();\r
XmlCursor cursor = msa.newCursor();\r
try{\r
- String comment = "Mod: " + mi.getName() + " Type: " + mi.getModuleType() + " Path: "\r
- + WorkspaceProfile.getMsaFile(mi).getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
+ String comment = "Mod: " + mi.getName() + " Type: " + SurfaceAreaQuery.getModuleType(mi) + " Path: "\r
+ + mi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
cursor.insertComment(comment);\r
}\r
catch(Exception e){\r
pcdConsumer = new ArrayList<String>();\r
}\r
//\r
+ // Check whether this PCD has already added to ModuleSA, if so, just return.\r
+ //\r
+ String moduleInfo = moduleSa.getModuleGuid().toLowerCase() + " " + moduleSa.getModuleVersion() \r
+ + " " + moduleSa.getPackageGuid().toLowerCase() + " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList());\r
+ for (int i = 0; i < pcdConsumer.size(); ++i) {\r
+ String pcdInfo = pcdConsumer.get(i);\r
+ if (moduleInfo.equals(pcdInfo.substring(0, pcdInfo.lastIndexOf(" ")))){\r
+ return;\r
+ }\r
+ }\r
+ //\r
// Using existing Pcd type, if this pcd already exists in other ModuleSA\r
//\r
if (pcdConsumer.size() > 0) {\r
- String[] valPart = pcdConsumer.get(0).split(" ");\r
- itemType = valPart[5];\r
+ \r
+ itemType = itemType (pcdConsumer.get(0));\r
}\r
- String listValue = moduleSa.getModuleGuid() + " " + moduleSa.getModuleVersion() \r
- + " " + moduleSa.getPackageGuid() + " " + moduleSa.getPackageVersion() + " " + listToString(moduleSa.getSupArchList())\r
- + " " + itemType;\r
+ String listValue = moduleInfo + " " + itemType;\r
pcdConsumer.add(listValue);\r
dynPcdMap.put(cName + " " + tsGuid, pcdConsumer);\r
\r
fpdPcd.setValue("0");\r
}\r
if (dataType.equals("BOOLEAN")){\r
- fpdPcd.setValue("false");\r
+ fpdPcd.setValue("FALSE");\r
}\r
if (dataType.equals("VOID*")) {\r
fpdPcd.setValue("");\r
return fpdBuildOpts;\r
}\r
\r
- public void genBuildOptionsUserExtensions(String fvName, String infName, String outputFileName, String[][] includeModules) {\r
+ public void genBuildOptionsUserExtensions(String fvName, String outputFileName, Vector<String[]> includeModules) {\r
+ QName elementFvName = new QName (xmlNs, "FvName");\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+ QName elementInfFileName = new QName(xmlNs, "InfFileName");\r
+ QName elementModule = new QName(xmlNs, "Module");\r
+ \r
UserExtensionsDocument.UserExtensions userExts = getfpdBuildOpts().addNewUserExtensions();\r
userExts.setUserID("IMAGES");\r
userExts.setIdentifier(new BigInteger("1"));\r
XmlCursor cursor = userExts.newCursor();\r
cursor.toEndToken();\r
\r
- cursor.beginElement("FvName");\r
+ cursor.beginElement(elementFvName);\r
cursor.insertChars(fvName);\r
cursor.toNextToken();\r
\r
- cursor.beginElement("InfFileName");\r
- cursor.insertChars(infName);\r
+ cursor.beginElement(elementInfFileName);\r
+ cursor.insertChars(fvName + ".inf");\r
cursor.toNextToken();\r
\r
- cursor.beginElement("IncludeModules");\r
- for (int i = 0; i < includeModules.length; ++i) {\r
- cursor.beginElement("Module");\r
- cursor.insertAttributeWithValue("ModuleGuid", includeModules[i][0]);\r
- cursor.insertAttributeWithValue("BaseName", includeModules[i][1]);\r
+ cursor.beginElement(elementIncludeModules);\r
+ for (int i = 0; i < includeModules.size(); ++i) {\r
+ cursor.beginElement(elementModule);\r
+ cursor.insertAttributeWithValue("ModuleGuid", includeModules.get(i)[0]);\r
+ if (!includeModules.get(i)[1].equals("null") && includeModules.get(i)[1].length() != 0) {\r
+ cursor.insertAttributeWithValue("ModuleVersion", includeModules.get(i)[1]);\r
+ }\r
+ cursor.insertAttributeWithValue("PackageGuid", includeModules.get(i)[2]);\r
+ if (!includeModules.get(i)[3].equals("null") && includeModules.get(i)[3].length() != 0) {\r
+ cursor.insertAttributeWithValue("PackageVersion", includeModules.get(i)[3]);\r
+ }\r
+ \r
+ cursor.insertAttributeWithValue("Arch", includeModules.get(i)[4]);\r
cursor.toEndToken();\r
cursor.toNextToken();\r
}\r
return -1;\r
}\r
ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
while (li.hasNext()) {\r
UserExtensionsDocument.UserExtensions ues = li.next();\r
if (!ues.getUserID().equals("IMAGES")) {\r
cursor.toFirstChild();\r
String elementName = cursor.getTextValue();\r
if (elementName.equals(fvName)) {\r
- cursor.toNextSibling(new QName("", "IncludeModules"));\r
+ cursor.toNextSibling(elementIncludeModules);\r
if (cursor.toFirstChild()) {\r
int i = 1;\r
for (i = 1; cursor.toNextSibling(); ++i);\r
if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
return;\r
}\r
+ \r
+ XmlCursor cursor = getfpdBuildOpts().newCursor();\r
+ QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
+ QName attribUserId = new QName ("UserID");\r
+ QName elementFvName = new QName (xmlNs, "FvName");\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+ QName attribModuleGuid = new QName("ModuleGuid");\r
+ QName attribModuleVersion = new QName("ModuleVersion");\r
+ QName attribPackageGuid = new QName("PackageGuid");\r
+ QName attribPackageVersion = new QName("PackageVersion");\r
+ QName attribArch = new QName("Arch");\r
+ \r
+ if (cursor.toChild(elementUserExts)) {\r
+ do {\r
+ cursor.push();\r
+ if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ cursor.toChild(elementFvName);\r
+ String elementName = cursor.getTextValue();\r
+ if (elementName.equals(fvName)) {\r
+ cursor.toNextSibling(elementIncludeModules);\r
+ if (cursor.toFirstChild()) {\r
+ int i = 0;\r
+ do {\r
+ saa[i][0] = cursor.getAttributeText(attribModuleGuid);\r
+ saa[i][1] = cursor.getAttributeText(attribModuleVersion);\r
+ saa[i][2] = cursor.getAttributeText(attribPackageGuid);\r
+ saa[i][3] = cursor.getAttributeText(attribPackageVersion);\r
+ saa[i][4] = cursor.getAttributeText(attribArch);\r
+ ++i;\r
+ }while (cursor.toNextSibling());\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ cursor.pop();\r
+ }while (cursor.toNextSibling(elementUserExts));\r
+ }\r
+ cursor.dispose();\r
+ \r
+ }\r
+ \r
+ public void updateBuildOptionsUserExtensions (String oldFvName, String newFvName) {\r
+ if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
+ return;\r
+ }\r
+ ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
+ while (li.hasNext()) {\r
+ UserExtensionsDocument.UserExtensions ues = li.next();\r
+ if (!ues.getUserID().equals("IMAGES")) {\r
+ continue;\r
+ }\r
+ XmlCursor cursor = ues.newCursor();\r
+ cursor.toFirstChild();\r
+ String elementName = cursor.getTextValue();\r
+ if (elementName.equals(oldFvName)) {\r
+ cursor.setTextValue(newFvName);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
+ }\r
+ \r
+ public void removeBuildOptionsUserExtensions (String fvName) {\r
+ if (getfpdBuildOpts().getUserExtensionsList() == null) {\r
+ return;\r
+ }\r
+ \r
ListIterator<UserExtensionsDocument.UserExtensions> li = getfpdBuildOpts().getUserExtensionsList().listIterator();\r
while (li.hasNext()) {\r
UserExtensionsDocument.UserExtensions ues = li.next();\r
cursor.toFirstChild();\r
String elementName = cursor.getTextValue();\r
if (elementName.equals(fvName)) {\r
- cursor.toNextSibling(new QName("", "IncludeModules"));\r
- if (cursor.toFirstChild()) {\r
- int i = 0;\r
- do {\r
- saa[i][0] = cursor.getAttributeText(new QName("ModuleGuid"));\r
- saa[i][1] = cursor.getAttributeText(new QName("BaseName"));\r
- ++i;\r
- }while (cursor.toNextSibling());\r
- }\r
+ cursor.toParent();\r
+ cursor.removeXml();\r
cursor.dispose();\r
return;\r
}\r
\r
}\r
\r
- public void genBuildOptionsUserDefAntTask (String id, String fileName, String execOrder) {\r
- UserDefinedAntTasksDocument.UserDefinedAntTasks udats = getfpdBuildOpts().getUserDefinedAntTasks();\r
- if (udats == null) {\r
- udats = getfpdBuildOpts().addNewUserDefinedAntTasks();\r
+ private boolean versionEqual (String v1, String v2) {\r
+ \r
+ if ((v1 == null || v1.length() == 0 || v1.equalsIgnoreCase("null")) \r
+ && (v2 == null || v2.length() == 0 || v2.equalsIgnoreCase("null"))) {\r
+ return true;\r
}\r
\r
- AntTaskDocument.AntTask at = udats.addNewAntTask();\r
- setBuildOptionsUserDefAntTask(id, fileName, execOrder, at);\r
+ if (v1 != null && v1.equals(v2)) {\r
+ return true;\r
+ }\r
+ \r
+ return false;\r
}\r
\r
- private void setBuildOptionsUserDefAntTask(String id, String fileName, String execOrder, AntTaskDocument.AntTask at) {\r
- at.setId(new Integer(id));\r
- XmlCursor cursor = at.newCursor();\r
- if (fileName != null){\r
- at.setFilename(fileName);\r
- }\r
- else if (cursor.toChild(xmlNs, "Filename")) {\r
- cursor.removeXml();\r
- }\r
- if (execOrder != null) {\r
- at.setAntCmdOptions(execOrder);\r
- }\r
+ public boolean moduleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ boolean inList = false;\r
+ if (getUserExtsIncModCount(fvName) > 0) {\r
+ \r
+ XmlCursor cursor = getfpdBuildOpts().newCursor();\r
+ QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
+ QName attribUserId = new QName ("UserID");\r
+ QName elementFvName = new QName (xmlNs, "FvName");\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+ QName attribModuleGuid = new QName("ModuleGuid");\r
+ QName attribModuleVersion = new QName("ModuleVersion");\r
+ QName attribPackageGuid = new QName("PackageGuid");\r
+ QName attribPackageVersion = new QName("PackageVersion");\r
+ QName attribArch = new QName("Arch");\r
+ \r
+ if (cursor.toChild(elementUserExts)) {\r
+ do {\r
+ cursor.push();\r
+ if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ cursor.toChild(elementFvName);\r
+ String elementName = cursor.getTextValue();\r
+ if (elementName.equals(fvName)) {\r
+ cursor.toNextSibling(elementIncludeModules);\r
+ if (cursor.toFirstChild()) {\r
+ \r
+ do {\r
+ String mg = cursor.getAttributeText(attribModuleGuid);\r
+ String mv = cursor.getAttributeText(attribModuleVersion);\r
+ String pg = cursor.getAttributeText(attribPackageGuid);\r
+ String pv = cursor.getAttributeText(attribPackageVersion);\r
+ String ar = cursor.getAttributeText(attribArch);\r
+ if (!moduleGuid.equalsIgnoreCase(mg)) {\r
+ continue;\r
+ }\r
+ if (!packageGuid.equalsIgnoreCase(pg)) {\r
+ continue;\r
+ }\r
+ if (!arch.equalsIgnoreCase(ar)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(moduleVersion, mv)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(packageVersion, pv)) {\r
+ continue;\r
+ }\r
+ inList = true;\r
+ break;\r
+ }while (cursor.toNextSibling());\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ cursor.pop();\r
+ }while (cursor.toNextSibling(elementUserExts));\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ return inList;\r
+ }\r
+ \r
+ public void removeModuleInBuildOptionsUserExtensions (String fvName, String moduleGuid, String moduleVersion, String packageGuid, String packageVersion, String arch) {\r
+ if (getUserExtsIncModCount(fvName) > 0) {\r
+ \r
+ XmlCursor cursor = getfpdBuildOpts().newCursor();\r
+ QName elementUserExts = new QName (xmlNs, "UserExtensions");\r
+ QName attribUserId = new QName ("UserID");\r
+ QName elementFvName = new QName (xmlNs, "FvName");\r
+ QName elementIncludeModules = new QName(xmlNs, "IncludeModules");\r
+ QName attribModuleGuid = new QName("ModuleGuid");\r
+ QName attribModuleVersion = new QName("ModuleVersion");\r
+ QName attribPackageGuid = new QName("PackageGuid");\r
+ QName attribPackageVersion = new QName("PackageVersion");\r
+ QName attribArch = new QName("Arch");\r
+ \r
+ if (cursor.toChild(elementUserExts)) {\r
+ do {\r
+ cursor.push();\r
+ if (cursor.getAttributeText(attribUserId).equals("IMAGES")) {\r
+ cursor.toChild(elementFvName);\r
+ String elementName = cursor.getTextValue();\r
+ if (elementName.equals(fvName)) {\r
+ cursor.toNextSibling(elementIncludeModules);\r
+ if (cursor.toFirstChild()) {\r
+ \r
+ do {\r
+ String mg = cursor.getAttributeText(attribModuleGuid);\r
+ String mv = cursor.getAttributeText(attribModuleVersion);\r
+ String pg = cursor.getAttributeText(attribPackageGuid);\r
+ String pv = cursor.getAttributeText(attribPackageVersion);\r
+ String ar = cursor.getAttributeText(attribArch);\r
+ if (!moduleGuid.equalsIgnoreCase(mg)) {\r
+ continue;\r
+ }\r
+ if (!packageGuid.equalsIgnoreCase(pg)) {\r
+ continue;\r
+ }\r
+ if (!arch.equalsIgnoreCase(ar)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(moduleVersion, mv)) {\r
+ continue;\r
+ }\r
+ if (!versionEqual(packageVersion, pv)) {\r
+ continue;\r
+ }\r
+ cursor.removeXml();\r
+ }while (cursor.toNextSibling());\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ cursor.pop();\r
+ }while (cursor.toNextSibling(elementUserExts));\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ }\r
+ \r
+ public void genBuildOptionsUserDefAntTask (String id, String fileName, String execOrder) {\r
+ UserDefinedAntTasksDocument.UserDefinedAntTasks udats = getfpdBuildOpts().getUserDefinedAntTasks();\r
+ if (udats == null) {\r
+ udats = getfpdBuildOpts().addNewUserDefinedAntTasks();\r
+ }\r
+ \r
+ AntTaskDocument.AntTask at = udats.addNewAntTask();\r
+ setBuildOptionsUserDefAntTask(id, fileName, execOrder, at);\r
+ }\r
+ \r
+ private void setBuildOptionsUserDefAntTask(String id, String fileName, String execOrder, AntTaskDocument.AntTask at) {\r
+ at.setId(new Integer(id));\r
+ XmlCursor cursor = at.newCursor();\r
+ if (fileName != null){\r
+ at.setFilename(fileName);\r
+ }\r
+ else if (cursor.toChild(xmlNs, "Filename")) {\r
+ cursor.removeXml();\r
+ }\r
+ if (execOrder != null) {\r
+ at.setAntCmdOptions(execOrder);\r
+ }\r
else if (cursor.toChild(xmlNs, "AntCmdOptions")) {\r
cursor.removeXml();\r
}\r
}\r
}\r
\r
+ public void getFvImagesFvImageFvImageNames (Vector<String> vImageNames) {\r
+ FvImagesDocument.FvImages fis = getfpdFlash().getFvImages();\r
+ if (fis == null || fis.getFvImageList() == null) {\r
+ return;\r
+ }\r
+ \r
+ ListIterator<FvImagesDocument.FvImages.FvImage> li = fis.getFvImageList().listIterator();\r
+ while (li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = li.next();\r
+ if (fi.getType().toString().equals("ImageName")) {\r
+ vImageNames.addAll(fi.getFvImageNamesList());\r
+ return;\r
+ }\r
+ }\r
+ }\r
+ \r
+ public void addFvImageFvImageNames (String[] fvNames) {\r
+ FvImagesDocument.FvImages fis = getfpdFlash().getFvImages();\r
+ if (fis == null || fis.getFvImageList() == null) {\r
+ genFvImagesFvImage (fvNames, "ImageName", null);\r
+ return;\r
+ }\r
+ \r
+ ListIterator<FvImagesDocument.FvImages.FvImage> li = fis.getFvImageList().listIterator();\r
+ while (li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = li.next();\r
+ if (fi.getType().toString().equals("ImageName")) {\r
+ addFvImageNamesInFvImage (fi, fvNames);\r
+ return;\r
+ }\r
+ }\r
+ genFvImagesFvImage (fvNames, "ImageName", null); \r
+ }\r
+ \r
+ public void addFvImageNamesInFvImage (FvImagesDocument.FvImages.FvImage fi, String[] fvNames) {\r
+ \r
+ for (int i = 0; i < fvNames.length; ++i) {\r
+ fi.addFvImageNames(fvNames[i]);\r
+ }\r
+ }\r
+ \r
+ public void addFvImageNamesInFvImage (int i, String[] fvNames) {\r
+ XmlObject o = getfpdFlash().getFvImages();\r
+ if (o == null) {\r
+ return;\r
+ }\r
+ XmlCursor cursor = o.newCursor();\r
+ QName qFvImage = new QName(xmlNs, "FvImage");\r
+ if (cursor.toChild(qFvImage)) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling(qFvImage);\r
+ }\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
+ addFvImageNamesInFvImage(fi, fvNames);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
public void genFvImagesFvImage(String[] names, String types, Map<String, String> options) {\r
\r
FvImagesDocument.FvImages fis = null;\r
cursor.dispose();\r
}\r
\r
+ /**\r
+ * @param oldFvName\r
+ * @param newFvName The New FV Name. If null, remove the old FvImageNames entry.\r
+ */\r
+ public void updateFvImageNameAll (String oldFvName, String newFvName) {\r
+ if (getfpdFlash().getFvImages() == null || getfpdFlash().getFvImages().getFvImageList() == null) {\r
+ return;\r
+ }\r
+ ListIterator<FvImagesDocument.FvImages.FvImage> li = getfpdFlash().getFvImages().getFvImageList().listIterator();\r
+ while (li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = li.next();\r
+ updateFvImageNamesInFvImage (fi, oldFvName, newFvName);\r
+ if (fi.getFvImageNamesList().size() == 0) {\r
+ li.remove();\r
+ }\r
+ }\r
+ }\r
+ \r
+ public void updateFvImageNamesInFvImage (int i, String oldFvName, String newFvName) {\r
+ XmlObject o = getfpdFlash().getFvImages();\r
+ if (o == null) {\r
+ return;\r
+ }\r
+ XmlCursor cursor = o.newCursor();\r
+ QName qFvImage = new QName(xmlNs, "FvImage");\r
+ if (cursor.toChild(qFvImage)) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling(qFvImage);\r
+ }\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
+ updateFvImageNamesInFvImage (fi, oldFvName, newFvName);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ /**\r
+ * @param fi\r
+ * @param oldFvName The FV Name to be replaced.\r
+ * @param newFvName The New FV Name. If null, remove the old FvImageNames entry.\r
+ */\r
+ public void updateFvImageNamesInFvImage (FvImagesDocument.FvImages.FvImage fi, String oldFvName, String newFvName) {\r
+ QName qFvImageNames = new QName(xmlNs, "FvImageNames");\r
+ XmlCursor cursor = fi.newCursor();\r
+ \r
+ if (cursor.toChild(qFvImageNames)) {\r
+ do {\r
+ String xmlValue = cursor.getTextValue();\r
+ if (xmlValue.equals(oldFvName)){\r
+ if (newFvName != null) {\r
+ cursor.setTextValue(newFvName);\r
+ }\r
+ else {\r
+ cursor.removeXml();\r
+ }\r
+ }\r
+ }while (cursor.toNextSibling(qFvImageNames));\r
+ }\r
+ \r
+ cursor.dispose();\r
+ }\r
+ \r
+ /**update the Type attribute of ith FvImage with new type.\r
+ * @param i\r
+ * @param type\r
+ */\r
+ public void updateFvImagesFvImageType (int i, String type) {\r
+ XmlObject o = getfpdFlash().getFvImages();\r
+ if (o == null) {\r
+ return;\r
+ }\r
+ XmlCursor cursor = o.newCursor();\r
+ QName qFvImage = new QName(xmlNs, "FvImage");\r
+ if (cursor.toChild(qFvImage)) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling(qFvImage);\r
+ }\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
+ fi.setType(FvImageTypes.Enum.forString(type));\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
public void updateFvImagesFvImage(int i, String[] names, String types, Map<String, String> options){\r
\r
XmlObject o = getfpdFlash().getFvImages();\r
cursor.dispose();\r
}\r
\r
- public int getFvImagesFvImageCount() {\r
+ public int getFvImagesFvImageCount(String type) {\r
\r
if (getfpdFlash().getFvImages() == null || getfpdFlash().getFvImages().getFvImageList() == null) {\r
return 0;\r
}\r
- return getfpdFlash().getFvImages().getFvImageList().size();\r
+ List<FvImagesDocument.FvImages.FvImage> l = getfpdFlash().getFvImages().getFvImageList();\r
+ ListIterator li = l.listIterator();\r
+ int i = 0;\r
+ while(li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)li.next();\r
+ if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
+ continue;\r
+ }\r
+ \r
+ ++i;\r
+ }\r
+ \r
+ return i;\r
}\r
\r
- /**Only Get Fv image setting - name and type.\r
+ public Vector<FvImagesDocument.FvImages.FvImage> getFvImagesFvImageWithName (String fvName, String type) {\r
+ Vector<FvImagesDocument.FvImages.FvImage> vFvImage = new Vector<FvImagesDocument.FvImages.FvImage>();\r
+ if (getfpdFlash().getFvImages() == null || getfpdFlash().getFvImages().getFvImageList() == null) {\r
+ return vFvImage;\r
+ }\r
+ List<FvImagesDocument.FvImages.FvImage> l = getfpdFlash().getFvImages().getFvImageList();\r
+ ListIterator li = l.listIterator();\r
+ while(li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)li.next();\r
+ if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
+ continue;\r
+ }\r
+ if (fi.getFvImageNamesList().contains(fvName)) {\r
+ vFvImage.add(fi);\r
+ }\r
+ }\r
+ \r
+ return vFvImage;\r
+ }\r
+ /**\r
* @param saa\r
+ * @param type "ALL" means all FvImage types: ImageName, Options, Attributes, Components.\r
*/\r
- public void getFvImagesFvImages(String[][] saa) {\r
+ public void getFvImagesFvImages(String[][] saa, String type) {\r
\r
if (getfpdFlash().getFvImages() == null) {\r
return;\r
int i = 0;\r
while(li.hasNext()) {\r
FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)li.next();\r
+ if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
+ continue;\r
+ }\r
//\r
// get FvImageNames array, space separated\r
//\r
}\r
}\r
\r
+ public void removeFvImageNameValue (int i, String attributeName) {\r
+ XmlObject o = getfpdFlash().getFvImages();\r
+ if (o == null) {\r
+ return;\r
+ }\r
+ XmlCursor cursor = o.newCursor();\r
+ QName qFvImage = new QName(xmlNs, "FvImage");\r
+ if (cursor.toChild(qFvImage)) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling(qFvImage);\r
+ }\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
+ removeFvImageNameValue (fi, attributeName);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ /**Remove from fi the attribute pair with attributeName in FvImageOptions.\r
+ * @param fi\r
+ * @param attributeName\r
+ */\r
+ public void removeFvImageNameValue (FvImagesDocument.FvImages.FvImage fi, String attributeName) {\r
+ if (fi.getFvImageOptions() != null && fi.getFvImageOptions().getNameValueList() != null) {\r
+ ListIterator<FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue> li = fi.getFvImageOptions().getNameValueList().listIterator();\r
+ while (li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = li.next();\r
+ if (nv.getName().equals(attributeName)) {\r
+ li.remove();\r
+ }\r
+ }\r
+ }\r
+ }\r
+ \r
+ public void removeTypedNamedFvImageNameValue (String fvName, String type, String optName) {\r
+ Vector<FvImagesDocument.FvImages.FvImage> vFvImage = getFvImagesFvImageWithName(fvName, type);\r
+ for (int i = 0; i < vFvImage.size(); ++i) {\r
+ FvImagesDocument.FvImages.FvImage fi = vFvImage.get(i);\r
+ removeFvImageNameValue (fi, optName);\r
+ }\r
+ }\r
+ \r
+ /**Add name-value pair to FvImage element with type.\r
+ * @param fvName FV name to add name-value pair.\r
+ * @param type FvImage attribute.\r
+ * @param name\r
+ * @param value\r
+ */\r
+ public void setTypedNamedFvImageNameValue (String fvName, String type, String name, String value) {\r
+ boolean fvImageExists = false;\r
+ if (getfpdFlash().getFvImages() == null) {\r
+ return;\r
+ }\r
+ List<FvImagesDocument.FvImages.FvImage> l = getfpdFlash().getFvImages().getFvImageList();\r
+ if (l == null) {\r
+ return;\r
+ }\r
+ ListIterator li = l.listIterator();\r
+ while(li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)li.next();\r
+ if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
+ continue;\r
+ }\r
+ if (!fi.getFvImageNamesList().contains(fvName)) {\r
+ continue;\r
+ }\r
+ fvImageExists = true;\r
+ setFvImagesFvImageNameValue (fi, name, value, null);\r
+ }\r
+ \r
+ if (!fvImageExists) {\r
+ HashMap<String, String> map = new HashMap<String, String>();\r
+ map.put(name, value);\r
+ genFvImagesFvImage(new String[]{fvName}, type, map);\r
+ }\r
+ }\r
+ \r
+ /**Add to all FvImage elements with type, the name-value pair.\r
+ * @param type\r
+ * @param name\r
+ * @param value\r
+ */\r
+ public void setTypedFvImageNameValue (String type, String name, String value) {\r
+ if (getfpdFlash().getFvImages() == null) {\r
+ return;\r
+ }\r
+ List<FvImagesDocument.FvImages.FvImage> l = getfpdFlash().getFvImages().getFvImageList();\r
+ if (l == null) {\r
+ return;\r
+ }\r
+ ListIterator li = l.listIterator();\r
+ while(li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)li.next();\r
+ if (!fi.getType().toString().equals(type) && !type.equals("ALL")) {\r
+ continue;\r
+ }\r
+ setFvImagesFvImageNameValue (fi, name, value, null);\r
+ }\r
+ \r
+ }\r
+ \r
+ public void setFvImagesFvImageNameValue (int i, String name, String value) {\r
+ XmlObject o = getfpdFlash().getFvImages();\r
+ if (o == null) {\r
+ return;\r
+ }\r
+ XmlCursor cursor = o.newCursor();\r
+ QName qFvImage = new QName(xmlNs, "FvImage");\r
+ if (cursor.toChild(qFvImage)) {\r
+ for (int j = 0; j < i; ++j) {\r
+ cursor.toNextSibling(qFvImage);\r
+ }\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
+ setFvImagesFvImageNameValue (fi, name, value, null);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
+ /**Add to FvImage the name-value pair, or replace old name with newName, or generate new name-value pair if not exists before.\r
+ * @param fi\r
+ * @param name\r
+ * @param value\r
+ * @param newName\r
+ */\r
+ public void setFvImagesFvImageNameValue (FvImagesDocument.FvImages.FvImage fi, String name, String value, String newName) {\r
+ if (fi.getFvImageOptions() == null || fi.getFvImageOptions().getNameValueList() == null) {\r
+ FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = fi.addNewFvImageOptions().addNewNameValue();\r
+ nv.setName(name);\r
+ nv.setValue(value);\r
+ if (newName != null) {\r
+ nv.setName(newName);\r
+ }\r
+ return;\r
+ }\r
+ \r
+ XmlCursor cursor = fi.getFvImageOptions().newCursor();\r
+ if (cursor.toFirstChild()) {\r
+ do {\r
+ FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = (FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue)cursor.getObject();\r
+ if (nv.getName().equals(name)) {\r
+ nv.setValue(value);\r
+ if (newName != null) {\r
+ nv.setName(newName);\r
+ }\r
+ cursor.dispose();\r
+ return;\r
+ }\r
+ }while (cursor.toNextSibling());\r
+ }\r
+ \r
+ FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = fi.getFvImageOptions().addNewNameValue();\r
+ nv.setName(name);\r
+ nv.setValue(value);\r
+ if (newName != null) {\r
+ nv.setName(newName);\r
+ }\r
+ cursor.dispose();\r
+ }\r
+ \r
+ public void getFvImagesFvImageOptions (String fvName, Map<String, String> m) {\r
+ Vector<FvImagesDocument.FvImages.FvImage> vFvImage = getFvImagesFvImageWithName (fvName, "Options");\r
+ for (int i = 0; i < vFvImage.size(); ++i) {\r
+ FvImagesDocument.FvImages.FvImage fi = vFvImage.get(i);\r
+ if (fi == null || fi.getFvImageOptions() == null || fi.getFvImageOptions().getNameValueList() == null) {\r
+ continue;\r
+ }\r
+\r
+ ListIterator<FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue> li = fi.getFvImageOptions()\r
+ .getNameValueList()\r
+ .listIterator();\r
+ while (li.hasNext()) {\r
+ FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue nv = li.next();\r
+ m.put(nv.getName(), nv.getValue());\r
+ }\r
+ }\r
+ }\r
+ \r
+ public int getFvImagePosInFvImages (String fvNameList, String type) {\r
+ XmlObject o = getfpdFlash().getFvImages();\r
+ if (o == null) {\r
+ return -1;\r
+ }\r
+ \r
+ int pos = -1;\r
+ String[] fvNameArray = fvNameList.trim().split(" ");\r
+ Vector<String> vFvNames = new Vector<String>();\r
+ \r
+ \r
+ XmlCursor cursor = o.newCursor();\r
+ QName qFvImage = new QName(xmlNs, "FvImage");\r
+ if (cursor.toChild(qFvImage)) {\r
+ do {\r
+ pos++;\r
+ vFvNames.removeAllElements();\r
+ for (int i = 0; i < fvNameArray.length; ++i) {\r
+ vFvNames.add(fvNameArray[i]);\r
+ }\r
+ FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
+ if (!fi.getType().toString().equals(type)) {\r
+ continue;\r
+ }\r
+ if (fi.getFvImageNamesList() == null || fi.getFvImageNamesList().size() != vFvNames.size()) {\r
+ continue;\r
+ }\r
+ ListIterator<String> li = fi.getFvImageNamesList().listIterator();\r
+ while (li.hasNext()) {\r
+ String name = li.next();\r
+ vFvNames.remove(name);\r
+ }\r
+ if (vFvNames.size() == 0) {\r
+ cursor.dispose();\r
+ return pos;\r
+ }\r
+ \r
+ }while (cursor.toNextSibling(qFvImage));\r
+ \r
+ }\r
+ cursor.dispose();\r
+ return -1;\r
+ }\r
/**Get FvImage Options for FvImage i\r
* @param i the ith FvImage\r
*/\r
}\r
FvImagesDocument.FvImages.FvImage fi = (FvImagesDocument.FvImages.FvImage)cursor.getObject();\r
if (fi.getFvImageOptions() == null || fi.getFvImageOptions().getNameValueList() == null){\r
+ cursor.dispose();\r
return;\r
}\r
ListIterator<FvImagesDocument.FvImages.FvImage.FvImageOptions.NameValue> li = fi.getFvImageOptions().getNameValueList().listIterator();\r
m.put(nv.getName(), nv.getValue());\r
}\r
}\r
+ cursor.dispose();\r
}\r
\r
/**\r
\r
PcdItemTypeConflictException(String pcdName, String info){\r
ModuleIdentification mi = WorkspaceProfile.getModuleId(info);\r
- details = pcdName + " ItemType Conflicts with " + mi.getName() + " in Pkg " + mi.getPackage().getName();\r
+ details = pcdName + " ItemType Conflicts with " + mi.getName() + " in Pkg " + mi.getPackageId().getName();\r
}\r
\r
public String getMessage() {\r
projects / mirror_edk2.git / blobdiff