X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdDynamicPcdBuildDefinitions.java;h=2dd39b459cd874dfcf37682fef373b66a4e7e5f2;hp=c846160ca8688455c84cb9ebfb9d2f90a689012a;hb=2cd33eaf8292e0ac7939019b02c06f0aafde559e;hpb=453a815ba0a3bdae7ec565b9a77549fb112b0c3d

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
index c846160ca8..2dd39b459c 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
@@ -11,6 +11,7 @@ import javax.swing.ListSelectionModel;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableColumn;
 
 import org.tianocore.PlatformSurfaceAreaDocument;
 import org.tianocore.frameworkwizard.common.DataValidation;
@@ -84,6 +85,7 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
     public void init(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {
         if (ffc == null) {
             ffc = new FpdFileContents(fpd);
+            ffc.initDynPcdMap();
         }
         String[][] saa = new String[ffc.getDynamicPcdBuildDataCount()][5];
         ffc.getDynamicPcdBuildData(saa);
@@ -154,7 +156,8 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
             modelPcd.addColumn("DatumType");
             jTableDynPcd = new JTable(modelPcd);
             jTableDynPcd.setRowHeight(20);
-            
+            TableColumn tokenColumn = jTableDynPcd.getColumnModel().getColumn(1);
+            jTableDynPcd.removeColumn(tokenColumn);
             jTableDynPcd.getColumnModel().getColumn(0).setMinWidth(250);
             
             jTableDynPcd.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
@@ -556,6 +559,9 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                 if (jRadioButtonHii.isSelected()) {
                     ffc.genDynamicPcdBuildDataSkuInfo("0", varName, varGuid, varOffset, hiiDefault, null, null, pcdSelected);
                     ArrayList<String> al = ffc.getDynPcdMapValue(cName + " " + tsGuid);
+                    if (al == null) {
+                        return;
+                    }
                     for (int i = 0; i < al.size(); ++i) {
                         String mKey = moduleInfo (al.get(i));
                         ffc.updatePcdData(mKey, cName, tsGuid, null, null, hiiDefault);
@@ -564,6 +570,9 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                 else if (jRadioButtonVpd.isSelected()){
                     ffc.genDynamicPcdBuildDataSkuInfo("0", null, null, null, null, vpdOffset, null, pcdSelected);
                     ArrayList<String> al = ffc.getDynPcdMapValue(cName + " " + tsGuid);
+                    if (al == null) {
+                        return;
+                    }
                     for (int i = 0; i < al.size(); ++i) {
                         String mKey = moduleInfo (al.get(i));
                         ffc.updatePcdData(mKey, cName, tsGuid, null, null, vpdOffset);
@@ -572,6 +581,9 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
                 else{
                     ffc.genDynamicPcdBuildDataSkuInfo("0", null, null, null, null, null, value, pcdSelected);
                     ArrayList<String> al = ffc.getDynPcdMapValue(cName + " " + tsGuid);
+                    if (al == null) {
+                        return;
+                    }
                     for (int i = 0; i < al.size(); ++i) {
                         String mKey = moduleInfo (al.get(i));
                         ffc.updatePcdData(mKey, cName, tsGuid, null, null, value);