git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@447 6f19259b...

diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuidEditor.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuidEditor.java
index cac74dfc1c98a1db44cfb219e0c051f96a21e513..3057f17babbf8d18dc0e5785906f6fe47be261b8 100644 (file)
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuidEditor.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/GuidEditor.java
@@ -84,8 +84,7 @@ public class GuidEditor extends AbstractCellEditor implements TableCellEditor, A
         }\r
         else { //User pressed dialog's "OK" button.\r
             currentGuid = dialog.getGuid();\r
-//            button.setText(currentGuid);\r
-//            fireEditingStopped();\r
+\r
         }\r
 \r
     }\r

diff --git a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
index 17a5a0cdb73269d0781215247e0c8299e96b73c4..b82c2bc7df0f827b274b8fed9341cbbab0968f8f 100644 (file)
--- a/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
+++ b/Tools/Source/PackageEditor/src/org/tianocore/packaging/SpdFileContents.java
@@ -16,7 +16,7 @@ import java.io.File;
 import java.io.IOException;\r
 import java.util.List;\r
 import java.util.ListIterator;\r
-\r
+import java.math.*;\r
 import org.apache.xmlbeans.XmlObject;\r
 import org.apache.xmlbeans.XmlOptions;\r
 import org.apache.xmlbeans.XmlCursor;\r
@@ -63,7 +63,7 @@ public class SpdFileContents {
 \r
     private SpdHeaderDocument.SpdHeader spdHdr = null;\r
 \r
-    private PackageNameDocument.PackageName spdHdrPkgName = null;\r
+    private String spdHdrPkgName = null;\r
 \r
     private GuidDocument.Guid spdHdrGuid = null;\r
 \r
@@ -209,7 +209,7 @@ public class SpdFileContents {
         if (getSpdHdr() == null) {\r
             spdHdr = psaRoot.addNewSpdHeader();\r
         }\r
-        s[0] = getSpdHdrPkgName().getStringValue();\r
+        s[0] = getSpdHdrPkgName();\r
         s[1] = getSpdHdrGuid().getStringValue();\r
         s[2] = getSpdHdrVer();\r
         s[3] = getSpdHdrAbs().getStringValue();\r
@@ -1097,7 +1097,7 @@ public class SpdFileContents {
    **/\r
     public String getSpdHdrVer() {\r
         if (spdHdr != null)\r
-            return spdHdr.getVersion();\r
+            return spdHdr.getVersion() + "";\r
         else\r
             return null;\r
     }\r
@@ -1109,7 +1109,7 @@ public class SpdFileContents {
    **/\r
     public void setSpdHdrVer(String ver) {\r
         if (spdHdr != null) {\r
-            spdHdr.setVersion(ver);\r
+            spdHdr.setVersion(new BigDecimal(ver.toCharArray()));\r
         }\r
 \r
     }\r
@@ -1171,7 +1171,7 @@ public class SpdFileContents {
     \r
     @return PackageNameDocument.PackageName\r
    **/\r
-    public PackageNameDocument.PackageName getSpdHdrPkgName() {\r
+    public String getSpdHdrPkgName() {\r
         if (spdHdrPkgName == null) {\r
             spdHdrPkgName = getSpdHdr().getPackageName();\r
         }\r
@@ -1186,10 +1186,9 @@ public class SpdFileContents {
     public void setSpdHdrPkgName(String pkgName) {\r
 \r
         if (getSpdHdrPkgName() != null) {\r
-            getSpdHdrPkgName().setStringValue(pkgName);\r
+            getSpdHdr().setPackageName(pkgName);\r
         } else {\r
-            spdHdrPkgName = getSpdHdr().addNewPackageName();\r
-            spdHdrPkgName.setStringValue(pkgName);\r
+            getSpdHdr().setPackageName(pkgName);\r
         }\r
     }\r
 \r