X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FJava%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FSpdPcdDefs.java;h=06a5d94417a330b9b40dfce9e9d1d308c4ba737c;hp=1905b483bf92ca4ae5d06c517a6dc36f61bd8097;hb=2109b16ef8007fd4033041065318fb199227628a;hpb=6f4f08890de71e0c28fcc5f23b7f92cb55d6160e

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index 1905b483bf..06a5d94417 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -164,6 +164,9 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
     private final int supArchMinWidth = 200;
     private final int supModMinWidth = 200;
 
+//    private Object boolModifyLock = new Object();
+//    private boolean exclusiveUsage = false;
+
     /**
      This method initializes this
      
@@ -831,15 +834,29 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
                 JOptionPane.showMessageDialog(frame, "You must choose at least one usage for PCD entry.");
                 return;
             }
+
             if (column <= 10 && column >= 6) {
                 Vector<String> v = stringToVector(usage);
                 if (compareTwoVectors(v, stringToVector(sa[6]))) {
                     return;
                 }
-                if (v.contains("FEATURE_FLAG") && v.size() > 1) {
+                if (v.contains("FEATURE_FLAG")/* && v.size() > 1 && !exclusiveUsage*/) {
+                    if (v.size() > 1) {
                     JOptionPane.showMessageDialog(frame, "Usage Feature Flag can NOT co-exist with others.");
                     return;
                 }
+//                    synchronized (boolModifyLock){
+//                        exclusiveUsage = true;
+//                    }
+//                    m.setValueAt(false, row, 7);
+//                    m.setValueAt(false, row, 8);
+//                    m.setValueAt(false, row, 9);
+//                    m.setValueAt(false, row, 10);
+                    else {
+                        m.setValueAt("BOOLEAN", row, 3);
+                    }
+                    
+                }
             }
             
             if (column == 11) {
@@ -910,6 +927,7 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
                         jCheckBoxFixedAtBuild.setSelected(false);
                         jCheckBoxDyn.setSelected(false);
                         jCheckBoxDynEx.setSelected(false);
+                        jComboBoxDataType.setSelectedItem("BOOLEAN");
                     }
                 }
             });