1. Fix EDKT323 (Only dependent packages' ppis can be added to module's ppi section)

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / ModulePCDs.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
index 492b305c7260a1f15208daf6e3f6ab55c50296f0..0c3b2fd6603ae9a826e6dc70424023595c0bd97c 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
@@ -29,6 +29,7 @@ import javax.swing.event.ListSelectionEvent;
 \r
 import org.tianocore.PcdCodedDocument;\r
 import org.tianocore.PcdItemTypes;\r
+import org.tianocore.PcdUsage;\r
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
 import org.tianocore.PcdCodedDocument.PcdCoded;\r
 import org.tianocore.PcdCodedDocument.PcdCoded.PcdEntry;\r
@@ -185,6 +186,7 @@ public class ModulePCDs extends IInternalFrame {
             model.addColumn("Name");\r
             model.addColumn("Type");\r
             model.addColumn("Value");\r
+            model.addColumn("Usage");\r
 \r
             jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTable.getSelectionModel().addListSelectionListener(this);\r
@@ -234,8 +236,11 @@ public class ModulePCDs extends IInternalFrame {
                     if (pcds.getPcdEntryList().get(index).getPcdItemType() != null) {\r
                         arg6 = pcds.getPcdEntryList().get(index).getPcdItemType().toString();\r
                     }\r
-\r
-                    id = new PcdCodedIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6);\r
+                    String arg7 = null;\r
+                    if (pcds.getPcdEntryList().get(index).getUsage() != null) {\r
+                        arg7 = pcds.getPcdEntryList().get(index).getUsage().toString();\r
+                    }\r
+                    id = new PcdCodedIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6, arg7);\r
                     vid.addPcdCoded(id);\r
                 }\r
             }\r
@@ -288,7 +293,7 @@ public class ModulePCDs extends IInternalFrame {
     }\r
 \r
     private void showEdit(int index) {\r
-        PCDsDlg dlg = new PCDsDlg(vid.getPcdCoded(index), new IFrame());\r
+        PCDsDlg dlg = new PCDsDlg(vid.getPcdCoded(index), new IFrame(), omt.getId());\r
         int result = dlg.showDialog();\r
         if (result == DataType.RETURN_TYPE_OK) {\r
             if (index == -1) {\r
@@ -345,7 +350,7 @@ public class ModulePCDs extends IInternalFrame {
         }\r
         if (arg0.getSource() == jButtonUpdate) {\r
             if (this.selectedRow < 0) {\r
-                Log.err("Please select one record first.");\r
+                Log.wrn("Update PcdCoded", "Please select one record first.");\r
                 return;\r
             }\r
             showEdit(selectedRow);\r
@@ -400,6 +405,9 @@ public class ModulePCDs extends IInternalFrame {
                     if (!isEmpty(vid.getPcdCoded(index).getType())) {\r
                         p.setPcdItemType(PcdItemTypes.Enum.forString(vid.getPcdCoded(index).getType()));\r
                     }\r
+                    if (!isEmpty(vid.getPcdCoded(index).getUsage())) {\r
+                        p.setUsage(PcdUsage.Enum.forString(vid.getPcdCoded(index).getUsage()));\r
+                    }\r
                     this.pcds.addNewPcdEntry();\r
                     this.pcds.setPcdEntryArray(pcds.getPcdEntryList().size() - 1, p);\r
                 }\r
@@ -408,7 +416,8 @@ public class ModulePCDs extends IInternalFrame {
             this.msa.setPcdCoded(pcds);\r
             this.omt.setSaved(false);\r
         } catch (Exception e) {\r
-            Log.err("Update Hobs", e.getMessage());\r
+            Log.wrn("Update PcdCoded", e.getMessage());\r
+            Log.err("Update PcdCoded", e.getMessage());\r
         }\r
     }\r
 \r
@@ -453,12 +462,16 @@ public class ModulePCDs extends IInternalFrame {
         int intPreferredWidth = this.getJContentPane().getPreferredSize().width;\r
         int intPreferredHeight = this.getJContentPane().getPreferredSize().height;\r
 \r
-        resizeComponent(this.jScrollPaneTable, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight);\r
-        relocateComponent(this.jButtonAdd, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight,\r
-                          DataType.SPACE_TO_RIGHT_FOR_ADD_BUTTON, DataType.SPACE_TO_BOTTOM_FOR_ADD_BUTTON);\r
-        relocateComponent(this.jButtonRemove, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight,\r
-                          DataType.SPACE_TO_RIGHT_FOR_REMOVE_BUTTON, DataType.SPACE_TO_BOTTOM_FOR_REMOVE_BUTTON);\r
-        relocateComponent(this.jButtonUpdate, intCurrentWidth, intCurrentHeight, intPreferredWidth, intPreferredHeight,\r
-                          DataType.SPACE_TO_RIGHT_FOR_UPDATE_BUTTON, DataType.SPACE_TO_BOTTOM_FOR_UPDATE_BUTTON);\r
+        Tools.resizeComponent(this.jScrollPaneTable, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                              intPreferredHeight);\r
+        Tools.relocateComponent(this.jButtonAdd, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                                intPreferredHeight, DataType.SPACE_TO_RIGHT_FOR_ADD_BUTTON,\r
+                                DataType.SPACE_TO_BOTTOM_FOR_ADD_BUTTON);\r
+        Tools.relocateComponent(this.jButtonRemove, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                                intPreferredHeight, DataType.SPACE_TO_RIGHT_FOR_REMOVE_BUTTON,\r
+                                DataType.SPACE_TO_BOTTOM_FOR_REMOVE_BUTTON);\r
+        Tools.relocateComponent(this.jButtonUpdate, intCurrentWidth, intCurrentHeight, intPreferredWidth,\r
+                                intPreferredHeight, DataType.SPACE_TO_RIGHT_FOR_UPDATE_BUTTON,\r
+                                DataType.SPACE_TO_BOTTOM_FOR_UPDATE_BUTTON);\r
     }\r
 }\r