X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;ds=sidebyside;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fpackaging%2Fui%2FSpdFileContents.java;h=2aaf6e22f7f047411804dcdf344dae1725db1564;hb=97796eaa70070c7cb0eff8f1c76bcb36de217347;hp=ca3a4dc710ccc08903279a45f6f35b213760cdc7;hpb=2f8a75176967947842e5e1c9b281524899d32ca0;p=mirror_edk2.git

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 ca3a4dc710..2aaf6e22f7 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
@@ -336,16 +336,26 @@ public class SpdFileContents {
             lc.setIncludeHeader(hdr);
             lc.setHelpText(hlp);
             if (clsUsage != null) {
-                lc.setRecommendedInstanceGuid(clsUsage);
-            }
-            if (instanceVer != null){
+              lc.setRecommendedInstanceGuid(clsUsage);
+              if (instanceVer != null){
                 lc.setRecommendedInstanceVersion(instanceVer);
+              } else {
+                lc.unsetRecommendedInstanceVersion();
+              }
+            } else {
+              lc.unsetRecommendedInstanceGuid();
+              lc.unsetRecommendedInstanceVersion();
             }
+
             if (stringToList(hdrAttribArch) != null){
-                lc.setSupArchList(stringToList(hdrAttribArch));
+              lc.setSupArchList(stringToList(hdrAttribArch));
+            } else {
+              lc.unsetSupArchList();
             }
             if (stringToList(hdrAttribModType) != null){
-                lc.setSupModuleList(stringToList(hdrAttribModType));
+              lc.setSupModuleList(stringToList(hdrAttribModType));
+            } else {
+              lc.unsetSupModuleList();
             }
         }
         
@@ -390,19 +400,19 @@ public class SpdFileContents {
                 e.setGuidTypeList(stringToList(guidTypeList));
             }
             else{
-                e.setGuidTypeList(null);
+                e.unsetGuidTypeList();
             }
             if (stringToList(archList) != null){
                 e.setSupArchList(stringToList(archList));
             }
             else{
-                e.setSupArchList(null);
+                e.unsetSupArchList();
             }
             if (stringToList(modTypeList) != null) {
                 e.setSupModuleList(stringToList(modTypeList));
             }
             else{
-                e.setSupModuleList(null);
+                e.unsetSupModuleList();
             }
             
         }
@@ -430,13 +440,13 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));
             }
             else{
-                e.setSupArchList(null);
+                e.unsetSupArchList();
             }
             if (stringToList(modTypeList) != null) {
                 e.setSupModuleList(stringToList(modTypeList));
             }
             else{
-                e.setSupModuleList(null);
+                e.unsetSupModuleList();
             }
         }
         cursor.dispose();
@@ -463,13 +473,13 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));
             }
             else{
-                e.setSupArchList(null);
+                e.unsetSupArchList();
             }
             if (stringToList(modTypeList) != null) {
                 e.setSupModuleList(stringToList(modTypeList));
             }
             else{
-                e.setSupModuleList(null);
+                e.unsetSupModuleList();
             }
         }
         cursor.dispose();
@@ -580,12 +590,14 @@ public class SpdFileContents {
                 libClass[i][1] = lc.getIncludeHeader();
                 libClass[i][2] = lc.getHelpText();
 // LAH added logic so you cannot set the version unless the GUID is defined.
+/* LAH do not set now
                 if (lc.getRecommendedInstanceGuid() != null) {
                   libClass[i][3] = lc.getRecommendedInstanceGuid();
                   if (lc.getRecommendedInstanceVersion() != null) {
                     libClass[i][4] = lc.getRecommendedInstanceVersion();
                   }
                 }
+*/
                 if (lc.getSupArchList() != null) {
                     libClass[i][5] = listToString(lc.getSupArchList());
                 }
@@ -967,17 +979,21 @@ public class SpdFileContents {
         lc.setIncludeHeader(clsIncludeFile);
         lc.setHelpText(help);
 // LAH added logic so you cannot set the version unless the GUID is defined.
+/* LAH
         if (clsUsage != null) {
           lc.setRecommendedInstanceGuid(clsUsage);
           if (instanceVer != null) {
             lc.setRecommendedInstanceVersion(instanceVer);
           }
         }
+*/
         if (hdrAttribArch != null) {
             lc.setSupArchList(stringToList(hdrAttribArch));
         }
         if (hdrAttribModType != null) {
-            lc.setSupModuleList(stringToList(hdrAttribModType));
+          lc.setSupModuleList(stringToList(hdrAttribModType));
+        } else {
+          lc.unsetSupModuleList();
         }
         
     }
@@ -1260,10 +1276,14 @@ public class SpdFileContents {
         pe.setTokenSpaceGuidCName(spaceGuid);
         pe.setHelpText(help);
         if (archList != null){
-            pe.setSupArchList(stringToList(archList));
+          pe.setSupArchList(stringToList(archList));
+        } else {
+          pe.unsetSupArchList();
         }
         if (modTypeList != null){
-            pe.setSupModuleList(stringToList(modTypeList));
+          pe.setSupModuleList(stringToList(modTypeList));
+        } else {
+          pe.unsetSupModuleList();
         }
     }