tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

1. Fix bug EDKT241 "If and MSA file is missing, the Wizard gives a NULL Pointer Exception, with no hints that the workspace is not valid." 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1444 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
hche10x 2006-09-05 02:12:02 +00:00
parent 2be2804b25
commit 94b0f428d7
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/GlobalData.java
View File

@ -93,10 +93,13 @@ public class GlobalData {
} catch (IOException e) {
Log.err("Open Module Surface Area " + modulePath, e.getMessage());
continue;
} catch (XmlException e) {
Log.err("Open Module Surface Area " + modulePath, e.getMessage());
continue;
} catch (Exception e) {
Log.err("Open Module Surface Area " + modulePath, "Invalid file type");
continue;
}
id = Tools.getId(modulePath, msa);
mid = new ModuleIdentification(id, vPackageList.elementAt(indexI));
@ -122,10 +125,13 @@ public class GlobalData {
spd = OpenFile.openSpdFile(path);
} catch (IOException e) {
Log.err("Open Package Surface Area " + path, e.getMessage());
continue;
} catch (XmlException e) {
Log.err("Open Package Surface Area " + path, e.getMessage());
continue;
} catch (Exception e) {
Log.err("Open Package Surface Area " + path, "Invalid file type");
continue;
}
id = Tools.getId(path, spd);
vPackageList.addElement(id);
@ -150,10 +156,13 @@ public class GlobalData {
fpd = OpenFile.openFpdFile(path);
} catch (IOException e) {
Log.err("Open Platform Surface Area " + path, e.getMessage());
continue;
} catch (XmlException e) {
Log.err("Open Platform Surface Area " + path, e.getMessage());
continue;
} catch (Exception e) {
Log.err("Open Platform Surface Area " + path, "Invalid file type");
continue;
}
id = Tools.getId(path, fpd);
vPlatformList.addElement(new PlatformIdentification(id));

5
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
View File

@ -294,8 +294,9 @@ public class WorkspaceTools {
for (int index = 0; index < modulePaths.size(); index++) {
modulePath = modulePaths.get(index);
ModuleIdentification id = GlobalData.openingModuleList.getIdByPath(modulePath);
v.addElement(id);
if (id != null) {
v.addElement(id);
}
}
Sort.sortModules(v, DataType.SORT_TYPE_ASCENDING);
return v;