Fix tracker "Package Library Class Recommended Instance should not default to null":

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / packaging / ui / SpdFileContents.java

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 5bac8be0cd7c4c511824a2cd527ea9c0e45747e7..e856cfce4c01f917a8218ed41436ba2863ba9c5e 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
@@ -129,6 +129,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getSpdPcdDefinitionCount() == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         } \r
         cursor.dispose();\r
     }\r
@@ -156,6 +160,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getSpdPpiDeclarationCount() == 0){\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         } \r
         cursor.dispose();\r
     }\r
@@ -182,6 +190,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getSpdProtocolDeclarationCount() == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         }\r
         cursor.dispose();\r
     }\r
@@ -208,7 +220,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
-\r
+            if (getSpdGuidDeclarationCount() == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         } \r
         cursor.dispose();\r
     }\r
@@ -236,6 +251,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getSpdPackageHeaderCount() == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         } \r
         cursor.dispose();\r
     }\r
@@ -263,6 +282,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getSpdMsaFileCount() == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         }\r
         cursor.dispose();\r
     }\r
@@ -290,6 +313,10 @@ public class SpdFileContents {
                 cursor.toNextSibling();\r
             }\r
             cursor.removeXml();\r
+            if (getSpdLibClassDeclarationCount() == 0) {\r
+                cursor.toParent();\r
+                cursor.removeXml();\r
+            }\r
         }\r
         cursor.dispose();\r
     }\r
@@ -309,16 +336,36 @@ public class SpdFileContents {
             lc.setIncludeHeader(hdr);\r
             lc.setHelpText(hlp);\r
             if (clsUsage != null) {\r
-                lc.setRecommendedInstanceGuid(clsUsage);\r
-            }\r
-            if (instanceVer != null){\r
+              lc.setRecommendedInstanceGuid(clsUsage);\r
+              if (instanceVer != null){\r
                 lc.setRecommendedInstanceVersion(instanceVer);\r
+              } else {\r
+                if (lc.isSetRecommendedInstanceVersion()) {\r
+                  lc.unsetRecommendedInstanceVersion();\r
+                }\r
+              }\r
+            } else {\r
+              if (lc.isSetRecommendedInstanceGuid()) {\r
+                lc.unsetRecommendedInstanceGuid();\r
+              }\r
+              if (lc.isSetRecommendedInstanceVersion()) {\r
+                  lc.unsetRecommendedInstanceVersion();\r
+              }\r
             }\r
+\r
             if (stringToList(hdrAttribArch) != null){\r
-                lc.setSupArchList(stringToList(hdrAttribArch));\r
+              lc.setSupArchList(stringToList(hdrAttribArch));\r
+            } else {\r
+              if (lc.isSetSupArchList()) {\r
+                lc.unsetSupArchList();\r
+              }\r
             }\r
             if (stringToList(hdrAttribModType) != null){\r
-                lc.setSupModuleList(stringToList(hdrAttribModType));\r
+              lc.setSupModuleList(stringToList(hdrAttribModType));\r
+            } else {\r
+              if (lc.isSetSupModuleList()) {\r
+                lc.unsetSupModuleList();\r
+              }\r
             }\r
         }\r
         \r
@@ -360,22 +407,28 @@ public class SpdFileContents {
             e.setGuidValue(guid);\r
             e.setHelpText(hlp);\r
             if (stringToList(guidTypeList) != null) {\r
-                e.setGuidTypeList(stringToList(guidTypeList));\r
+              e.setGuidTypeList(stringToList(guidTypeList));\r
             }\r
             else{\r
-                e.setGuidTypeList(null);\r
+              if (e.isSetGuidTypeList()) {\r
+                e.unsetGuidTypeList();\r
+              }\r
             }\r
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
             else{\r
-                e.setSupArchList(null);\r
+              if (e.isSetSupArchList()) {\r
+                e.unsetSupArchList();\r
+              }\r
             }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
             else{\r
-                e.setSupModuleList(null);\r
+              if (e.isSetSupModuleList()) {\r
+                e.unsetSupModuleList();\r
+              }\r
             }\r
             \r
         }\r
@@ -403,13 +456,17 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));\r
             }\r
             else{\r
-                e.setSupArchList(null);\r
+              if (e.isSetSupArchList()) {\r
+                e.unsetSupArchList();\r
+              }\r
             }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
             else{\r
-                e.setSupModuleList(null);\r
+              if (e.isSetSupModuleList()) {\r
+                e.unsetSupModuleList();\r
+              }\r
             }\r
         }\r
         cursor.dispose();\r
@@ -436,13 +493,17 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));\r
             }\r
             else{\r
-                e.setSupArchList(null);\r
+              if (e.isSetSupArchList()) {\r
+                e.unsetSupArchList();\r
+              }\r
             }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
             else{\r
-                e.setSupModuleList(null);\r
+              if (e.isSetSupModuleList()) {\r
+                e.unsetSupModuleList();\r
+              }\r
             }\r
         }\r
         cursor.dispose();\r
@@ -493,12 +554,23 @@ public class SpdFileContents {
             e.setTokenSpaceGuidCName(spaceGuid);\r
             e.setDefaultValue(defaultString);\r
             e.setHelpText(help);\r
-            if (archList != null && archList.length() > 0){\r
+            if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
-            if (modTypeList != null && modTypeList.length() > 0){\r
+            else{\r
+              if (e.isSetSupArchList()) {\r
+                e.unsetSupArchList();\r
+              }\r
+            }\r
+            if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
+            else{\r
+              if (e.isSetSupModuleList()) {\r
+                e.unsetSupModuleList();\r
+              }\r
+            }\r
+            \r
         } \r
         cursor.dispose();\r
     }\r
@@ -552,8 +624,15 @@ public class SpdFileContents {
                 libClass[i][0] = lc.getName();\r
                 libClass[i][1] = lc.getIncludeHeader();\r
                 libClass[i][2] = lc.getHelpText();\r
-                libClass[i][3] = lc.getRecommendedInstanceGuid();\r
-                libClass[i][4] = lc.getRecommendedInstanceVersion();\r
+// LAH added logic so you cannot set the version unless the GUID is defined.\r
+/* LAH do not set now\r
+                if (lc.getRecommendedInstanceGuid() != null) {\r
+                  libClass[i][3] = lc.getRecommendedInstanceGuid();\r
+                  if (lc.getRecommendedInstanceVersion() != null) {\r
+                    libClass[i][4] = lc.getRecommendedInstanceVersion();\r
+                  }\r
+                }\r
+*/\r
                 if (lc.getSupArchList() != null) {\r
                     libClass[i][5] = listToString(lc.getSupArchList());\r
                 }\r
@@ -934,13 +1013,37 @@ public class SpdFileContents {
         lc.setName(clsName);\r
         lc.setIncludeHeader(clsIncludeFile);\r
         lc.setHelpText(help);\r
-        lc.setRecommendedInstanceGuid(clsUsage);\r
-        lc.setRecommendedInstanceVersion(instanceVer);\r
+// LAH added logic so you cannot set the version unless the GUID is defined.\r
+\r
+        if (clsUsage != null) {\r
+          lc.setRecommendedInstanceGuid(clsUsage);\r
+          if (instanceVer != null) {\r
+            lc.setRecommendedInstanceVersion(instanceVer);\r
+          }\r
+        }\r
+        else {\r
+          if (lc.isSetRecommendedInstanceGuid()) {\r
+              lc.unsetRecommendedInstanceGuid();\r
+          }\r
+          if (lc.isSetRecommendedInstanceVersion()) {\r
+              lc.unsetRecommendedInstanceVersion();\r
+          }\r
+        }\r
+\r
         if (hdrAttribArch != null) {\r
             lc.setSupArchList(stringToList(hdrAttribArch));\r
+        } else {\r
+          if (lc.isSetSupArchList()) {\r
+            lc.unsetSupArchList();\r
+          }\r
         }\r
+\r
         if (hdrAttribModType != null) {\r
-            lc.setSupModuleList(stringToList(hdrAttribModType));\r
+          lc.setSupModuleList(stringToList(hdrAttribModType));\r
+        } else {\r
+          if (lc.isSetSupModuleList()) {\r
+            lc.unsetSupModuleList();\r
+          }\r
         }\r
         \r
     }\r
@@ -1223,10 +1326,18 @@ public class SpdFileContents {
         pe.setTokenSpaceGuidCName(spaceGuid);\r
         pe.setHelpText(help);\r
         if (archList != null){\r
-            pe.setSupArchList(stringToList(archList));\r
+          pe.setSupArchList(stringToList(archList));\r
+        } else {\r
+          if (pe.isSetSupArchList()) {\r
+            pe.unsetSupArchList();\r
+          }\r
         }\r
         if (modTypeList != null){\r
-            pe.setSupModuleList(stringToList(modTypeList));\r
+          pe.setSupModuleList(stringToList(modTypeList));\r
+        } else {\r
+          if (pe.isSetSupModuleList()) {\r
+            pe.unsetSupModuleList();\r
+          }\r
         }\r
     }\r
 \r
@@ -1465,7 +1576,7 @@ public class SpdFileContents {
     @return SpecificationDocument.Specification\r
    **/\r
     public String getSpdHdrSpec() {\r
-        return "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";\r
+        return "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052";\r
 //        return getSpdHdr().getSpecification();\r
     }\r
 \r
@@ -1475,7 +1586,7 @@ public class SpdFileContents {
     @param spec \r
    **/\r
     public void setSpdHdrSpec(String spec) {\r
-        spec = "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";\r
+        spec = "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052";\r
         getSpdHdr().setSpecification(spec);\r
         \r
     }\r