summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
Diffstat (limited to 'Tools')
-rw-r--r--Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java2
-rw-r--r--Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java12
2 files changed, 8 insertions, 6 deletions
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
index fc77c6bcb7..3c008504d1 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java
@@ -15,8 +15,6 @@
package org.tianocore.frameworkwizard.module.ui.dialog;
import java.awt.event.ActionEvent;
-import java.awt.event.ItemEvent;
-import java.awt.event.ItemListener;
import java.util.Vector;
import javax.swing.JButton;
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index 617f74e0bd..f730fa2a6e 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -182,7 +182,7 @@ public class FpdFileContents {
}
public int getFrameworkModulesCount() {
- if (getfpdFrameworkModules().getModuleSAList() == null){
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){
removeElement(getfpdFrameworkModules());
fpdFrameworkModules = null;
return 0;
@@ -223,7 +223,7 @@ public class FpdFileContents {
public ModuleSADocument.ModuleSA getModuleSA(String key) {
String[] s = key.split(" ");
- if (getfpdFrameworkModules().getModuleSAList() == null) {
+ if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {
removeElement(getfpdFrameworkModules());
fpdFrameworkModules = null;
return null;
@@ -1034,7 +1034,7 @@ public class FpdFileContents {
}
public int getDynamicPcdBuildDataCount() {
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {
+ if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {
removeElement(getfpdDynPcdBuildDefs());
fpdDynPcdBuildDefs = null;
return 0;
@@ -1043,7 +1043,7 @@ public class FpdFileContents {
}
public void getDynamicPcdBuildData(String[][] saa) {
- if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {
+ if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {
removeElement(getfpdDynPcdBuildDefs());
fpdDynPcdBuildDefs = null;
return ;
@@ -1962,6 +1962,10 @@ public class FpdFileContents {
public void getPlatformDefsSkuInfos(String[][] saa){
if (getfpdPlatformDefs().getSkuInfo() == null || getfpdPlatformDefs().getSkuInfo().getUiSkuNameList() == null) {
+ if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {
+ removeElement(getfpdDynPcdBuildDefs());
+ fpdDynPcdBuildDefs = null;
+ }
return ;
}