1. Fix EDKT429 The number of Type in [MSA->BootMode->BootModeAttributes->BootModeName...

2. Fix EDKT430 Private in [MSA->BootMode->BootModeAttributes->Uasge] should be removed
3. Fix EDKT431 Tool in [MSA->Library Class Definition->Support Module Type] should be removed.

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
index e23982a24837f64b4678563ec2eb30b9d769ff2f..80166959df28ebd59584ebb46bf7ef36aefc121d 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
@@ -386,7 +386,6 @@ public class EnumerationData {
         vFrameworkModuleTypes.addElement("DXE_RUNTIME_DRIVER");\r
         vFrameworkModuleTypes.addElement("DXE_SAL_DRIVER");\r
         vFrameworkModuleTypes.addElement("DXE_SMM_DRIVER");\r
         vFrameworkModuleTypes.addElement("DXE_RUNTIME_DRIVER");\r
         vFrameworkModuleTypes.addElement("DXE_SAL_DRIVER");\r
         vFrameworkModuleTypes.addElement("DXE_SMM_DRIVER");\r

-        vFrameworkModuleTypes.addElement("TOOL");\r

         vFrameworkModuleTypes.addElement("UEFI_DRIVER");\r
         vFrameworkModuleTypes.addElement("UEFI_APPLICATION");\r
         vFrameworkModuleTypes.addElement("USER_DEFINED");\r
         vFrameworkModuleTypes.addElement("UEFI_DRIVER");\r
         vFrameworkModuleTypes.addElement("UEFI_APPLICATION");\r
         vFrameworkModuleTypes.addElement("USER_DEFINED");\r


@@ -648,12 +647,22 @@ public class EnumerationData {
         vBootModeNames.addElement("MINIMAL");\r
         vBootModeNames.addElement("NO_CHANGE");\r
         vBootModeNames.addElement("DIAGNOSTICS");\r
         vBootModeNames.addElement("MINIMAL");\r
         vBootModeNames.addElement("NO_CHANGE");\r
         vBootModeNames.addElement("DIAGNOSTICS");\r

+        vBootModeNames.addElement("DEFAULT");\r

         vBootModeNames.addElement("S2_RESUME");\r
         vBootModeNames.addElement("S3_RESUME");\r
         vBootModeNames.addElement("S4_RESUME");\r
         vBootModeNames.addElement("S5_RESUME");\r
         vBootModeNames.addElement("FLASH_UPDATE");\r
         vBootModeNames.addElement("S2_RESUME");\r
         vBootModeNames.addElement("S3_RESUME");\r
         vBootModeNames.addElement("S4_RESUME");\r
         vBootModeNames.addElement("S5_RESUME");\r
         vBootModeNames.addElement("FLASH_UPDATE");\r

-        vBootModeNames.addElement("RECOVERY");\r
+        vBootModeNames.addElement("RECOVERY_FULL");\r
+        vBootModeNames.addElement("RECOVERY_MINIMAL");\r
+        vBootModeNames.addElement("RECOVERY_NO_CHANGE");\r
+        vBootModeNames.addElement("RECOVERY_DIAGNOSTICS");\r
+        vBootModeNames.addElement("RECOVERY_DEFAULT");\r
+        vBootModeNames.addElement("RECOVERY_S2_RESUME");\r
+        vBootModeNames.addElement("RECOVERY_S3_RESUME");\r
+        vBootModeNames.addElement("RECOVERY_S4_RESUME");\r
+        vBootModeNames.addElement("RECOVERY_S5_RESUME");\r
+        vBootModeNames.addElement("RECOVERY_FLASH_UPDATE");\r

     }\r
     \r
     private void initBootModeUsage() {\r
     }\r
     \r
     private void initBootModeUsage() {\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
index 41aec889df3aebbd130bcd6d9ba63a5a0381d023..5b5f49dc5979c6cec971c25719a2dce37ad6d708 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java
@@ -373,7 +373,7 @@ public class BootModesDlg extends IDialog {
      */\r
     private void initFrame() {\r
         Tools.generateComboBoxByVector(jComboBoxBootModeName, ed.getVBootModeNames());\r
      */\r
     private void initFrame() {\r
         Tools.generateComboBoxByVector(jComboBoxBootModeName, ed.getVBootModeNames());\r

-        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());\r
+        Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVBootModeUsage());\r

     }\r
 \r
     /*\r
     }\r
 \r
     /*\r