]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
1. Fix EDKT273 "Externs are not being grouped together in MSA Files"
[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / ModuleExterns.java
index d885028bd8ef4d1a59630e9152616e38fc166e03..cc8a81a167bfbfe1245e2946ebe6a6ff4ad8ca9c 100644 (file)
@@ -29,7 +29,6 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;\r
 \r
 import org.tianocore.ExternsDocument;\r
-import org.tianocore.PcdDriverTypes;\r
 import org.tianocore.ExternsDocument.Externs;\r
 import org.tianocore.ExternsDocument.Externs.Extern;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
@@ -184,8 +183,9 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
             jTable = new JTable(model);\r
             jTable.setRowHeight(20);\r
 \r
-            model.addColumn("Name");\r
             model.addColumn("Type");\r
+            model.addColumn("Name");\r
+            model.addColumn("Value");\r
 \r
             jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable.getSelectionModel().addListSelectionListener(this);\r
@@ -195,10 +195,6 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
         return jTable;\r
     }\r
 \r
-    public static void main(String[] args) {\r
-\r
-    }\r
-\r
     /**\r
      This method initializes this\r
      \r
@@ -221,17 +217,6 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
         this.externs = inExterns;\r
 \r
         if (this.externs != null) {\r
-            //\r
-            // Get PcdIsDriver\r
-            //\r
-            if (this.externs.getPcdIsDriver() != null) {\r
-                String arg0 = this.externs.getPcdIsDriver().toString();\r
-                String arg1 = EnumerationData.EXTERNS_PCD_IS_DRIVER;\r
-\r
-                id = new ExternsIdentification(arg0, arg1, null, null);\r
-                vid.addExterns(id);\r
-            }\r
-\r
             //\r
             // Get specification\r
             //\r
@@ -240,7 +225,7 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
                     String arg0 = externs.getSpecificationList().get(index);\r
                     String arg1 = EnumerationData.EXTERNS_SPECIFICATION;\r
 \r
-                    id = new ExternsIdentification(arg0, arg1, null, null);\r
+                    id = new ExternsIdentification(arg0, arg1);\r
                     vid.addExterns(id);\r
                 }\r
             }\r
@@ -250,57 +235,63 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
             //\r
             if (this.externs.getExternList().size() > 0) {\r
                 for (int index = 0; index < this.externs.getExternList().size(); index++) {\r
-                    String arg0 = null;\r
-                    String arg1 = null;\r
-                    if (this.externs.getExternList().get(index).getModuleEntryPoint() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getModuleEntryPoint();\r
-                        arg1 = EnumerationData.EXTERNS_MODULE_ENTRY_POINT;\r
-                    }\r
-                    if (this.externs.getExternList().get(index).getModuleUnloadImage() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getModuleUnloadImage();\r
-                        arg1 = EnumerationData.EXTERNS_MODULE_UNLOAD_IMAGE;\r
-                    }\r
+                    //\r
+                    // Get common data\r
+                    //\r
+                    String featureFlag = externs.getExternList().get(index).getFeatureFlag();\r
+                    Vector<String> arch = Tools\r
+                                               .convertListToVector(externs.getExternList().get(index).getSupArchList());\r
 \r
-                    if (this.externs.getExternList().get(index).getConstructor() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getConstructor();\r
-                        arg1 = EnumerationData.EXTERNS_CONSTRUCTOR;\r
+                    //\r
+                    // Get Image data\r
+                    //\r
+                    if (this.externs.getExternList().get(index).getModuleEntryPoint() != null\r
+                        || this.externs.getExternList().get(index).getModuleUnloadImage() != null) {\r
+                        String moduleEntryPoint = this.externs.getExternList().get(index).getModuleEntryPoint();\r
+                        String moduleUnloadImage = this.externs.getExternList().get(index).getModuleUnloadImage();\r
+                        String type = EnumerationData.EXTERNS_IMAGE;\r
+                        id = new ExternsIdentification(moduleEntryPoint, moduleUnloadImage, type, featureFlag, arch);\r
                     }\r
-                    if (this.externs.getExternList().get(index).getDestructor() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getDestructor();\r
-                        arg1 = EnumerationData.EXTERNS_DESTRUCTOR;\r
+\r
+                    //\r
+                    // Get Library Data\r
+                    //\r
+                    if (this.externs.getExternList().get(index).getConstructor() != null\r
+                        || this.externs.getExternList().get(index).getDestructor() != null) {\r
+                        String constructor = this.externs.getExternList().get(index).getConstructor();\r
+                        String destructor = this.externs.getExternList().get(index).getDestructor();\r
+                        String type = EnumerationData.EXTERNS_LIBRARY;\r
+                        id = new ExternsIdentification(constructor, destructor, type, featureFlag, arch);\r
                     }\r
 \r
+                    //\r
+                    // Get Driver Data\r
+                    //\r
                     if (this.externs.getExternList().get(index).getDriverBinding() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getDriverBinding();\r
-                        arg1 = EnumerationData.EXTERNS_DRIVER_BINDING;\r
-                    }\r
-                    if (this.externs.getExternList().get(index).getComponentName() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getComponentName();\r
-                        arg1 = EnumerationData.EXTERNS_COMPONENT_NAME;\r
-                    }\r
-                    if (this.externs.getExternList().get(index).getDriverConfig() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getDriverConfig();\r
-                        arg1 = EnumerationData.EXTERNS_DRIVER_CONFIG;\r
-                    }\r
-                    if (this.externs.getExternList().get(index).getDriverDiag() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getDriverDiag();\r
-                        arg1 = EnumerationData.EXTERNS_DRIVER_DIAG;\r
+                        String driverBinding = this.externs.getExternList().get(index).getDriverBinding();\r
+                        String componentName = this.externs.getExternList().get(index).getComponentName();\r
+                        String driverConfig = this.externs.getExternList().get(index).getDriverConfig();\r
+                        String driverDiag = this.externs.getExternList().get(index).getDriverDiag();\r
+                        String type = EnumerationData.EXTERNS_DRIVER;\r
+                        id = new ExternsIdentification(driverBinding, componentName, driverConfig, driverDiag, type,\r
+                                                       featureFlag, arch);\r
                     }\r
 \r
-                    if (this.externs.getExternList().get(index).getSetVirtualAddressMapCallBack() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getSetVirtualAddressMapCallBack();\r
-                        arg1 = EnumerationData.EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK;\r
-                    }\r
-                    if (this.externs.getExternList().get(index).getExitBootServicesCallBack() != null) {\r
-                        arg0 = this.externs.getExternList().get(index).getExitBootServicesCallBack();\r
-                        arg1 = EnumerationData.EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK;\r
+                    //\r
+                    // Get Call Back Data\r
+                    //\r
+                    if (this.externs.getExternList().get(index).getSetVirtualAddressMapCallBack() != null\r
+                        || this.externs.getExternList().get(index).getExitBootServicesCallBack() != null) {\r
+                        String virtualAddressMap = this.externs.getExternList().get(index)\r
+                                                               .getSetVirtualAddressMapCallBack();\r
+                        String exitBootServices = this.externs.getExternList().get(index).getExitBootServicesCallBack();\r
+                        String type = EnumerationData.EXTERNS_CALL_BACK;\r
+                        id = new ExternsIdentification(virtualAddressMap, exitBootServices, type, featureFlag, arch);\r
                     }\r
 \r
-                    String arg2 = externs.getExternList().get(index).getFeatureFlag();\r
-                    Vector<String> arg3 = Tools\r
-                                               .convertListToVector(externs.getExternList().get(index).getSupArchList());\r
-\r
-                    id = new ExternsIdentification(arg0, arg1, arg2, arg3);\r
+                    //\r
+                    // Add id to vector\r
+                    //\r
                     vid.addExterns(id);\r
                 }\r
             }\r
@@ -391,7 +382,45 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
 \r
         if (vid.size() > 0) {\r
             for (int index = 0; index < vid.size(); index++) {\r
+                int line = 1;\r
+\r
+                //\r
+                // For Specification\r
+                //\r
+                if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_SPECIFICATION)) {\r
+                    line = 1;\r
+                }\r
+\r
+                //\r
+                // For Image\r
+                //\r
+                if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_IMAGE)) {\r
+                    line = 2;\r
+                }\r
+\r
+                //\r
+                // For Library\r
+                //\r
+                if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_LIBRARY)) {\r
+                    line = 2;\r
+                }\r
+\r
+                //\r
+                // For Driver\r
+                //\r
+                if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_DRIVER)) {\r
+                    line = 4;\r
+                }\r
+\r
+                //\r
+                // For Call Back\r
+                //\r
+                if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_CALL_BACK)) {\r
+                    line = 2;\r
+                }\r
+\r
                 model.addRow(vid.toStringVector(index));\r
+                jTable.setRowHeight(index, line * 18);\r
             }\r
         }\r
         this.jTable.repaint();\r
@@ -439,107 +468,116 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
         try {\r
             int count = this.vid.size();\r
 \r
-            this.externs = Externs.Factory.newInstance();\r
-            //            //\r
-            //            // Save PcdIsDriver first\r
-            //            //\r
-            //            if (!this.jComboBoxPcdIsDriver.getSelectedItem().toString().equals(DataType.EMPTY_SELECT_ITEM)) {\r
-            //                externs.setPcdIsDriver(PcdDriverTypes.Enum.forString(this.jComboBoxPcdIsDriver.getSelectedItem()\r
-            //                                                                                              .toString()));\r
-            //            }\r
+            //\r
+            // Save pcd and flash map information first\r
+            //\r
+            Externs ex = Externs.Factory.newInstance();\r
+            if (this.externs.getPcdIsDriver() != null) {\r
+                ex.setPcdIsDriver(this.externs.getPcdIsDriver());\r
+            }\r
+            if (this.externs.getTianoR8FlashMapH()) {\r
+                ex.setTianoR8FlashMapH(this.externs.getTianoR8FlashMapH());\r
+            }\r
+            this.externs = ex;\r
 \r
+            //\r
+            // Save externs\r
+            //\r
             if (count > 0) {\r
                 for (int index = 0; index < count; index++) {\r
-                    //\r
-                    // Save Pcd Is Driver\r
-                    //\r
-                    if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_PCD_IS_DRIVER)) {\r
-                        externs.setPcdIsDriver(PcdDriverTypes.Enum.forString(vid.getExterns(index).getName()));\r
-                        continue;\r
-                    }\r
-\r
                     //\r
                     // Save specfication\r
                     //\r
                     if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_SPECIFICATION)) {\r
-                        if (!isEmpty(vid.getExterns(index).getName())) {\r
+                        if (!isEmpty(vid.getExterns(index).getName0())) {\r
                             this.externs.addNewSpecification();\r
                             this.externs.setSpecificationArray(externs.getSpecificationList().size() - 1,\r
-                                                               vid.getExterns(index).getName());\r
+                                                               vid.getExterns(index).getName0());\r
+                            continue;\r
                         }\r
-                    } else {\r
-                        //\r
-                        // Save extern\r
-                        //\r
-                        Extern e = Extern.Factory.newInstance();\r
-\r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_MODULE_ENTRY_POINT)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setModuleEntryPoint(vid.getExterns(index).getName());\r
+                    }\r
+\r
+                    Extern e = Extern.Factory.newInstance();\r
+                    //\r
+                    // Save image\r
+                    //\r
+                    if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_IMAGE)) {\r
+                        if (!isEmpty(vid.getExterns(index).getName0()) || !isEmpty(vid.getExterns(index).getName1())) {\r
+                            e = Extern.Factory.newInstance();\r
+                            if (!isEmpty(vid.getExterns(index).getName0())) {\r
+                                e.setModuleEntryPoint(vid.getExterns(index).getName0());\r
                             }\r
-                        }\r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_MODULE_UNLOAD_IMAGE)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setModuleUnloadImage(vid.getExterns(index).getName());\r
+                            if (!isEmpty(vid.getExterns(index).getName1())) {\r
+                                e.setModuleUnloadImage(vid.getExterns(index).getName1());\r
                             }\r
                         }\r
+                    }\r
 \r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_CONSTRUCTOR)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setConstructor(vid.getExterns(index).getName());\r
+                    //\r
+                    // Save library\r
+                    //\r
+                    if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_LIBRARY)) {\r
+                        if (!isEmpty(vid.getExterns(index).getName0()) || !isEmpty(vid.getExterns(index).getName1())) {\r
+                            e = Extern.Factory.newInstance();\r
+                            if (!isEmpty(vid.getExterns(index).getName0())) {\r
+                                e.setConstructor(vid.getExterns(index).getName0());\r
                             }\r
-                        }\r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_DESTRUCTOR)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setDestructor(vid.getExterns(index).getName());\r
+                            if (!isEmpty(vid.getExterns(index).getName1())) {\r
+                                e.setDestructor(vid.getExterns(index).getName1());\r
                             }\r
                         }\r
+                    }\r
 \r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_DRIVER_BINDING)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setDriverBinding(vid.getExterns(index).getName());\r
+                    //\r
+                    // Save call back\r
+                    //\r
+                    if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_CALL_BACK)) {\r
+                        if (!isEmpty(vid.getExterns(index).getName0()) || !isEmpty(vid.getExterns(index).getName1())) {\r
+                            e = Extern.Factory.newInstance();\r
+                            if (!isEmpty(vid.getExterns(index).getName0())) {\r
+                                e.setSetVirtualAddressMapCallBack(vid.getExterns(index).getName0());\r
                             }\r
-                        }\r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_COMPONENT_NAME)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setComponentName(vid.getExterns(index).getName());\r
+                            if (!isEmpty(vid.getExterns(index).getName1())) {\r
+                                e.setExitBootServicesCallBack(vid.getExterns(index).getName1());\r
                             }\r
                         }\r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_DRIVER_CONFIG)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setDriverConfig(vid.getExterns(index).getName());\r
+                    }\r
+\r
+                    //\r
+                    // Save driver\r
+                    //\r
+                    if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_DRIVER)) {\r
+                        if (!isEmpty(vid.getExterns(index).getName0()) || !isEmpty(vid.getExterns(index).getName1())\r
+                            || !isEmpty(vid.getExterns(index).getName2()) || !isEmpty(vid.getExterns(index).getName3())) {\r
+                            e = Extern.Factory.newInstance();\r
+                            if (!isEmpty(vid.getExterns(index).getName0())) {\r
+                                e.setDriverBinding(vid.getExterns(index).getName0());\r
                             }\r
-                        }\r
-                        if (vid.getExterns(index).getType().equals(EnumerationData.EXTERNS_DRIVER_DIAG)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setDriverDiag(vid.getExterns(index).getName());\r
+                            if (!isEmpty(vid.getExterns(index).getName1())) {\r
+                                e.setComponentName(vid.getExterns(index).getName1());\r
                             }\r
-                        }\r
-\r
-                        if (vid.getExterns(index).getType()\r
-                               .equals(EnumerationData.EXTERNS_SET_VIRTUAL_ADDRESS_MAP_CALL_BACK)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setSetVirtualAddressMapCallBack(vid.getExterns(index).getName());\r
+                            if (!isEmpty(vid.getExterns(index).getName2())) {\r
+                                e.setDriverConfig(vid.getExterns(index).getName2());\r
                             }\r
-                        }\r
-                        if (vid.getExterns(index).getType()\r
-                               .equals(EnumerationData.EXTERNS_EXIT_BOOT_SERVICES_CALL_BACK)) {\r
-                            if (!isEmpty(vid.getExterns(index).getName())) {\r
-                                e.setExitBootServicesCallBack(vid.getExterns(index).getName());\r
+                            if (!isEmpty(vid.getExterns(index).getName3())) {\r
+                                e.setDriverDiag(vid.getExterns(index).getName3());\r
                             }\r
                         }\r
+                    }\r
 \r
-                        if (!isEmpty(vid.getExterns(index).getFeatureFlag())) {\r
-                            e.setFeatureFlag(vid.getExterns(index).getFeatureFlag());\r
-                        }\r
-                        if (vid.getExterns(index).getSupArchList() != null\r
-                            && vid.getExterns(index).getSupArchList().size() > 0) {\r
-                            e.setSupArchList(vid.getExterns(index).getSupArchList());\r
-                        }\r
-\r
-                        this.externs.addNewExtern();\r
-                        this.externs.setExternArray(this.externs.getExternList().size() - 1, e);\r
+                    //\r
+                    // Save common data\r
+                    //\r
+                    if (!isEmpty(vid.getExterns(index).getFeatureFlag())) {\r
+                        e.setFeatureFlag(vid.getExterns(index).getFeatureFlag());\r
                     }\r
+                    if (vid.getExterns(index).getSupArchList() != null\r
+                        && vid.getExterns(index).getSupArchList().size() > 0) {\r
+                        e.setSupArchList(vid.getExterns(index).getSupArchList());\r
+                    }\r
+\r
+                    this.externs.addNewExtern();\r
+                    this.externs.setExternArray(this.externs.getExternList().size() - 1, e);\r
                 }\r
             }\r
 \r