tyler.durden/audk
1
0
Fork 0
mirror of https://github.com/acidanthera/audk.git synced 2025-07-27 15:44:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix the bug of library instance selection interference between different archs of ModuleSA.

Browse Source 
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1137 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jlin16 2006-07-28 06:10:45 +00:00
parent c941b270ea
commit 57d0e52a71
3 changed files with 488 additions and 486 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
View File

@ -231,7 +231,7 @@ public class FpdFileContents {
ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator(); ListIterator li = getfpdFrameworkModules().getModuleSAList().listIterator();
while(li.hasNext()) { while(li.hasNext()) {
ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next(); ModuleSADocument.ModuleSA msa = (ModuleSADocument.ModuleSA)li.next();
if (msa.getModuleGuid().equals(s[0]) && msa.getPackageGuid().equals(s[2])) { if (msa.getModuleGuid().equalsIgnoreCase(s[0]) && msa.getPackageGuid().equalsIgnoreCase(s[2])) {
if (msa.getModuleVersion() != null) { if (msa.getModuleVersion() != null) {
if (!msa.getModuleVersion().equals(s[1])) { if (!msa.getModuleVersion().equals(s[1])) {
continue; continue;

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
View File

@ -518,7 +518,7 @@ public class FpdFrameworkModules extends IInternalFrame {
while(ispi.hasNext()) { while(ispi.hasNext()) {
PackageIdentification pi = (PackageIdentification)ispi.next(); PackageIdentification pi = (PackageIdentification)ispi.next();
if ( !pi.getGuid().equals(keyPart[2])){ if ( !pi.getGuid().equalsIgnoreCase(keyPart[2])){
continue; continue;
} }
@ -531,7 +531,7 @@ public class FpdFrameworkModules extends IInternalFrame {
Iterator ismi = smi.iterator(); Iterator ismi = smi.iterator();
while(ismi.hasNext()) { while(ismi.hasNext()) {
ModuleIdentification mi = (ModuleIdentification)ismi.next(); ModuleIdentification mi = (ModuleIdentification)ismi.next();
if (mi.getGuid().equals(keyPart[0])){ if (mi.getGuid().equalsIgnoreCase(keyPart[0])){
if (keyPart[1] != null && keyPart[1].length() > 0 && !keyPart[1].equals("null")){ if (keyPart[1] != null && keyPart[1].length() > 0 && !keyPart[1].equals("null")){
if(!mi.getVersion().equals(keyPart[1])){ if(!mi.getVersion().equals(keyPart[1])){
continue; continue;

966
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
View File

File diff suppressed because it is too large Load Diff