1. keep from generating empty FrameworkModules.

2. remove unused import in EventsDlg.java

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1120 6f19259b-4bc3-4df7-8a09-765794883524

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 fc77c6bcb7622d08f954bf7d2cb73b1a84995f15..3c008504d11d5bb43e65ac33d8450c25bb1893e3 100644 (file)
--- 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;\r
 \r
 import java.awt.event.ActionEvent;\r
 package org.tianocore.frameworkwizard.module.ui.dialog;\r
 \r
 import java.awt.event.ActionEvent;\r

-import java.awt.event.ItemEvent;\r
-import java.awt.event.ItemListener;\r

 import java.util.Vector;\r
 \r
 import javax.swing.JButton;\r
 import java.util.Vector;\r
 \r
 import javax.swing.JButton;\r

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 617f74e0bd95996366a01a7159860a442c7e7b5b..f730fa2a6ee22cee410c272c63b5138f80e91df3 100644 (file)
--- 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 {
     }\r
     \r
     public int getFrameworkModulesCount() {\r
     }\r
     \r
     public int getFrameworkModulesCount() {\r

-        if (getfpdFrameworkModules().getModuleSAList() == null){\r
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0){\r

             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return 0;\r
             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return 0;\r


@@ -223,7 +223,7 @@ public class FpdFileContents {
     \r
     public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
         String[] s = key.split(" ");\r
     \r
     public ModuleSADocument.ModuleSA getModuleSA(String key) {\r
         String[] s = key.split(" ");\r

-        if (getfpdFrameworkModules().getModuleSAList() == null) {\r
+        if (getfpdFrameworkModules().getModuleSAList() == null || getfpdFrameworkModules().getModuleSAList().size() == 0) {\r

             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return null;\r
             removeElement(getfpdFrameworkModules());\r
             fpdFrameworkModules = null;\r
             return null;\r


@@ -1034,7 +1034,7 @@ public class FpdFileContents {
     }\r
     \r
     public int getDynamicPcdBuildDataCount() {\r
     }\r
     \r
     public int getDynamicPcdBuildDataCount() {\r

-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r

             removeElement(getfpdDynPcdBuildDefs());\r
             fpdDynPcdBuildDefs = null;\r
             return 0;\r
             removeElement(getfpdDynPcdBuildDefs());\r
             fpdDynPcdBuildDefs = null;\r
             return 0;\r


@@ -1043,7 +1043,7 @@ public class FpdFileContents {
     }\r
     \r
     public void getDynamicPcdBuildData(String[][] saa) {\r
     }\r
     \r
     public void getDynamicPcdBuildData(String[][] saa) {\r

-        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+        if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null || getfpdDynPcdBuildDefs().getPcdBuildDataList().size() == 0) {\r

             removeElement(getfpdDynPcdBuildDefs());\r
             fpdDynPcdBuildDefs = null;\r
             return ;\r
             removeElement(getfpdDynPcdBuildDefs());\r
             fpdDynPcdBuildDefs = null;\r
             return ;\r


@@ -1962,6 +1962,10 @@ public class FpdFileContents {
     \r
     public void getPlatformDefsSkuInfos(String[][] saa){\r
         if (getfpdPlatformDefs().getSkuInfo() == null || getfpdPlatformDefs().getSkuInfo().getUiSkuNameList() == null) {\r
     \r
     public void getPlatformDefsSkuInfos(String[][] saa){\r
         if (getfpdPlatformDefs().getSkuInfo() == null || getfpdPlatformDefs().getSkuInfo().getUiSkuNameList() == null) {\r

+            if (getfpdDynPcdBuildDefs().getPcdBuildDataList() == null) {\r
+                removeElement(getfpdDynPcdBuildDefs());\r
+                fpdDynPcdBuildDefs = null;\r
+            }\r

             return ;\r
         }\r
         \r
             return ;\r
         }\r
         \r