1. change SPD Pcd editor title to "PCD Declarations".

2. PCD editor: remove attribute SupArchList, SupModList if no value set for them.

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

3 files changed, 24 insertions, 5 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
index 3b5c686956..6bd63d43b4 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
@@ -551,12 +551,23 @@ public class SpdFileContents {
             e.setTokenSpaceGuidCName(spaceGuid);

             e.setDefaultValue(defaultString);

             e.setHelpText(help);

-            if (archList != null && archList.length() > 0){

+            if (stringToList(archList) != null){

                 e.setSupArchList(stringToList(archList));

             }

-            if (modTypeList != null && modTypeList.length() > 0){

+            else{

+              if (e.isSetSupArchList()) {

+                e.unsetSupArchList();

+              }

+            }

+            if (stringToList(modTypeList) != null) {

                 e.setSupModuleList(stringToList(modTypeList));

             }

+            else{

+              if (e.isSetSupModuleList()) {

+                e.unsetSupModuleList();

+              }

+            }

+            

         } 

         cursor.dispose();

     }

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
index 3f39727e4e..046fe8cb6c 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java
@@ -29,6 +29,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;

 import javax.swing.JTextField;

 

+

 import org.tianocore.PackageSurfaceAreaDocument;

 import org.tianocore.frameworkwizard.common.DataValidation;

 import org.tianocore.frameworkwizard.common.Log;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index 742081a4b5..ba2d55bd7a 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -156,7 +156,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
      

      **/

     private void initialize() {

-        this.setTitle("PCD Definition");

+        this.setTitle("PCD Declarations");

         this.setDefaultCloseOperation(javax.swing.WindowConstants.DISPOSE_ON_CLOSE);

 

     }

@@ -731,8 +731,15 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             String defaultVal = m.getValueAt(row, 4) + "";

             String help = m.getValueAt(row, 5) + "";

             String usage = getValidUsage(new Boolean(m.getValueAt(row, 6)+""), new Boolean(m.getValueAt(row, 7)+""), new Boolean(m.getValueAt(row, 8)+""), new Boolean(m.getValueAt(row, 9)+""), new Boolean(m.getValueAt(row, 10)+""));

-            String archList = vectorToString(iCheckBoxList.getAllCheckedItemsString());

-            String modTypeList = vectorToString(iCheckBoxList1.getAllCheckedItemsString());

+            

+            String archList = null;

+            if (m.getValueAt(row, 11) != null){

+                archList = m.getValueAt(row, 11).toString();

+            }

+            String modTypeList = null;

+            if (m.getValueAt(row, 12) != null) {

+                modTypeList = m.getValueAt(row, 12).toString(); 

+            }

             if (usage.length() == 0) {

                 JOptionPane.showMessageDialog(frame, "You must choose at least one usage for PCD entry.");

                 return;