Adpate to schema merge.

[mirror_edk2.git] / Tools / Source / PackageEditor / src / org / tianocore / packaging / SpdFileContents.java

diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
index 9511eed3d56ba7df223aaa34b07e0a1c4067e338..d8b69e8d2fd46ac7a3f73083793bc4fa90a2d774 100644 (file)
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
@@ -67,12 +67,8 @@ public class SpdFileContents {
 \r
     private GuidDocument.Guid spdHdrGuid = null;\r
 \r
-    private AbstractDocument.Abstract spdHdrAbs = null;\r
-\r
     private LicenseDocument.License spdHdrLicense = null;\r
 \r
-    private SpecificationDocument.Specification spdHdrSpec = null;\r
-\r
     private OutputDirectoryDocument.OutputDirectory spdHdrOutDir = null;\r
 \r
     private LibraryClassDeclarationsDocument.LibraryClassDeclarations spdLibClassDeclarations = null;\r
@@ -212,7 +208,7 @@ public class SpdFileContents {
         s[0] = getSpdHdrPkgName();\r
         s[1] = getSpdHdrGuid().getStringValue();\r
         s[2] = getSpdHdrVer();\r
-        s[3] = getSpdHdrAbs().getStringValue();\r
+       s[3] = getSpdHdrAbs();\r
         s[4] = getSpdHdr().getDescription();\r
         s[5] = getSpdHdr().getCopyright();\r
         s[6] = getSpdHdrLicense().getStringValue();\r
@@ -1030,11 +1026,9 @@ public class SpdFileContents {
      \r
      @return AbstractDocument.Abstract\r
     **/\r
-    public AbstractDocument.Abstract getSpdHdrAbs() {\r
-        if (spdHdrAbs == null) {\r
-            spdHdrAbs = getSpdHdr().getAbstract();\r
-        }\r
-        return spdHdrAbs;\r
+    public String getSpdHdrAbs() {\r
+        \r
+        return getSpdHdr().getAbstract();\r
     }\r
 \r
     /**\r
@@ -1043,13 +1037,7 @@ public class SpdFileContents {
      @param abs The value set to Abstract element\r
     **/\r
     public void setSpdHdrAbs(String abs) {\r
-\r
-        if (getSpdHdrAbs() != null) {\r
-            getSpdHdrAbs().setStringValue(abs);\r
-        } else {\r
-            spdHdrAbs = getSpdHdr().addNewAbstract();\r
-            spdHdrAbs.setStringValue(abs);\r
-        }\r
+           getSpdHdr().setAbstract(abs);\r
     }\r
 \r
     /**\r
@@ -1128,7 +1116,7 @@ public class SpdFileContents {
    **/\r
     public void setSpdHdrVer(String ver) {\r
         if (spdHdr != null) {\r
-            spdHdr.setVersion(new BigDecimal(ver.toCharArray()));\r
+            spdHdr.setVersion(ver);\r
         }\r
 \r
     }\r
@@ -1211,15 +1199,7 @@ public class SpdFileContents {
         }\r
     }\r
 \r
-    /**\r
-    Reserved method\r
-    \r
-    @return SpecificationDocument.Specification\r
-   **/\r
-    public SpecificationDocument.Specification getSpdHdrSpec() {\r
-        return spdHdrSpec;\r
-    }\r
-\r
+  \r
     /**\r
     Reserved method\r
     \r
@@ -1229,12 +1209,9 @@ public class SpdFileContents {
         if (spec == null) {\r
             return;\r
         }\r
-        if (getSpdHdrSpec() != null) {\r
-            getSpdHdrSpec().setStringValue(spec);\r
-        } else {\r
-            spdHdrSpec = getSpdHdr().addNewSpecification();\r
-            spdHdrSpec.setStringValue(spec);\r
-        }\r
+        \r
+        getSpdHdr().setSpecification(spec);\r
+        \r
     }\r
 \r
     /**\r