Added some checks to see if the attributes were set - clears up some warning messages...

[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 2aaf6e22f7f047411804dcdf344dae1725db1564..3b5c686956459e616c8819ad0ed36c081e457b87 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
@@ -340,22 +340,29 @@ public class SpdFileContents {
               if (instanceVer != null){\r
                 lc.setRecommendedInstanceVersion(instanceVer);\r
               } else {\r
-                lc.unsetRecommendedInstanceVersion();\r
+                if (lc.isSetRecommendedInstanceVersion()) {\r
+                  lc.unsetRecommendedInstanceVersion();\r
+                }\r
               }\r
             } else {\r
-              lc.unsetRecommendedInstanceGuid();\r
-              lc.unsetRecommendedInstanceVersion();\r
+              if (lc.isSetRecommendedInstanceGuid()) {\r
+                lc.unsetRecommendedInstanceGuid();\r
+              }\r
             }\r
 \r
             if (stringToList(hdrAttribArch) != null){\r
               lc.setSupArchList(stringToList(hdrAttribArch));\r
             } else {\r
-              lc.unsetSupArchList();\r
+              if (lc.isSetSupArchList()) {\r
+                lc.unsetSupArchList();\r
+              }\r
             }\r
             if (stringToList(hdrAttribModType) != null){\r
               lc.setSupModuleList(stringToList(hdrAttribModType));\r
             } else {\r
-              lc.unsetSupModuleList();\r
+              if (lc.isSetSupModuleList()) {\r
+                lc.unsetSupModuleList();\r
+              }\r
             }\r
         }\r
         \r
@@ -397,22 +404,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
+              if (e.isSetGuidTypeList()) {\r
                 e.unsetGuidTypeList();\r
+              }\r
             }\r
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\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
@@ -440,13 +453,17 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));\r
             }\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
         cursor.dispose();\r
@@ -473,13 +490,17 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));\r
             }\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
         cursor.dispose();\r
@@ -989,11 +1010,18 @@ public class SpdFileContents {
 */\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
         } else {\r
-          lc.unsetSupModuleList();\r
+          if (lc.isSetSupModuleList()) {\r
+            lc.unsetSupModuleList();\r
+          }\r
         }\r
         \r
     }\r
@@ -1278,12 +1306,16 @@ public class SpdFileContents {
         if (archList != null){\r
           pe.setSupArchList(stringToList(archList));\r
         } else {\r
-          pe.unsetSupArchList();\r
+          if (pe.isSetSupArchList()) {\r
+            pe.unsetSupArchList();\r
+          }\r
         }\r
         if (modTypeList != null){\r
           pe.setSupModuleList(stringToList(modTypeList));\r
         } else {\r
-          pe.unsetSupModuleList();\r
+          if (pe.isSetSupModuleList()) {\r
+            pe.unsetSupModuleList();\r
+          }\r
         }\r
     }\r
 \r