Adpate to schema merge.

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@572 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
index e1682887c5337fc364f488d364c65ba6d847f1eb..7edf49a3ff2759e342de033b33da5e4a71000290 100644 (file)
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
@@ -462,11 +462,10 @@ public class MsaHeader extends IInternalFrame {
                 this.jTextAreaDescription.setText(this.msaHeader.getDescription());\r
             }\r
             if (this.msaHeader.getSpecification() != null) {\r
                 this.jTextAreaDescription.setText(this.msaHeader.getDescription());\r
             }\r
             if (this.msaHeader.getSpecification() != null) {\r

-                this.jTextFieldSpecification.setText(this.msaHeader.getSpecification().getStringValue());\r
+                this.jTextFieldSpecification.setText(this.msaHeader.getSpecification());\r

             }\r
             if (this.msaHeader.getAbstract() != null) {\r
             }\r
             if (this.msaHeader.getAbstract() != null) {\r

-                this.jTextFieldAbstract.setText(this.msaHeader.getAbstract().getStringValue());\r
-                this.jTextFieldAbstractURL.setText(this.msaHeader.getAbstract().getURL());\r
+                this.jTextFieldAbstract.setText(this.msaHeader.getAbstract());\r

             }\r
             if (this.msaHeader.getModuleType() != null) {\r
                 this.jComboBoxModuleType.setSelectedItem(this.msaHeader.getModuleType().toString());\r
             }\r
             if (this.msaHeader.getModuleType() != null) {\r
                 this.jComboBoxModuleType.setSelectedItem(this.msaHeader.getModuleType().toString());\r


@@ -703,22 +702,17 @@ public class MsaHeader extends IInternalFrame {
             this.msaHeader.setDescription(this.jTextAreaDescription.getText());\r
 \r
             if (this.msaHeader.getSpecification() != null) {\r
             this.msaHeader.setDescription(this.jTextAreaDescription.getText());\r
 \r
             if (this.msaHeader.getSpecification() != null) {\r

-                this.msaHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());\r
+                this.msaHeader.setSpecification(this.jTextFieldSpecification.getText());\r

             } else {\r
             } else {\r

-                SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory\r
-                                                                                                                .newInstance();\r
-                mSpecification.setStringValue(this.jTextFieldSpecification.getText());\r
-                this.msaHeader.setSpecification(mSpecification);\r
+                \r
+                this.msaHeader.setSpecification(this.jTextFieldSpecification.getText());\r

             }\r
 \r
             if (this.msaHeader.getAbstract() != null) {\r
             }\r
 \r
             if (this.msaHeader.getAbstract() != null) {\r

-                this.msaHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText());\r
-                this.msaHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText());\r
+                this.msaHeader.setAbstract(this.jTextFieldAbstract.getText());\r

             } else {\r
             } else {\r

-                AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance();\r
-                mAbstract.setStringValue(this.jTextFieldAbstract.getText());\r
-                mAbstract.setURL(this.jTextFieldAbstractURL.getText());\r
-                this.msaHeader.setAbstract(mAbstract);\r
+                \r
+                this.msaHeader.setAbstract(this.jTextFieldAbstract.getText());\r

             }\r
             this.msaHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()\r
                                                                                               .toString()));\r
             }\r
             this.msaHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()\r
                                                                                               .toString()));\r

diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
index c35c84f6d72cce9ca38920e73f854e2555d215fe..9940f75f47ef0e124053b28074c71e8cbf2e2c1f 100644 (file)
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
@@ -434,11 +434,10 @@ public class MsaLibHeader extends IInternalFrame {
                 this.jTextAreaDescription.setText(this.msaLibHeader.getDescription());\r
             }\r
             if (this.msaLibHeader.getSpecification() != null) {\r
                 this.jTextAreaDescription.setText(this.msaLibHeader.getDescription());\r
             }\r
             if (this.msaLibHeader.getSpecification() != null) {\r

-                this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification().getStringValue());\r
+                this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification());\r

             }\r
             if (this.msaLibHeader.getAbstract() != null) {\r
             }\r
             if (this.msaLibHeader.getAbstract() != null) {\r

-                this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract().getStringValue());\r
-                this.jTextFieldAbstractURL.setText(this.msaLibHeader.getAbstract().getURL());\r
+                this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract());\r

             }\r
             if (this.msaLibHeader.getModuleType() != null) {\r
                 this.jComboBoxModuleType.setSelectedItem(this.msaLibHeader.getModuleType().toString());\r
             }\r
             if (this.msaLibHeader.getModuleType() != null) {\r
                 this.jComboBoxModuleType.setSelectedItem(this.msaLibHeader.getModuleType().toString());\r


@@ -704,22 +703,16 @@ public class MsaLibHeader extends IInternalFrame {
             this.msaLibHeader.setDescription(this.jTextAreaDescription.getText());\r
 \r
             if (this.msaLibHeader.getSpecification() != null) {\r
             this.msaLibHeader.setDescription(this.jTextAreaDescription.getText());\r
 \r
             if (this.msaLibHeader.getSpecification() != null) {\r

-                this.msaLibHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());\r
+                this.msaLibHeader.setSpecification(this.jTextFieldSpecification.getText());\r

             } else {\r
             } else {\r

-                SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory\r
-                                                                                                                .newInstance();\r
-                mSpecification.setStringValue(this.jTextFieldSpecification.getText());\r
-                this.msaLibHeader.setSpecification(mSpecification);\r
+                this.msaLibHeader.setSpecification(this.jTextFieldSpecification.getText());\r

             }\r
 \r
             if (this.msaLibHeader.getAbstract() != null) {\r
             }\r
 \r
             if (this.msaLibHeader.getAbstract() != null) {\r

-                this.msaLibHeader.getAbstract().setStringValue(this.jTextFieldAbstract.getText());\r
-                this.msaLibHeader.getAbstract().setURL(this.jTextFieldAbstractURL.getText());\r
+                this.msaLibHeader.setAbstract(this.jTextFieldAbstract.getText());\r

             } else {\r
             } else {\r

-                AbstractDocument.Abstract mAbstract = AbstractDocument.Abstract.Factory.newInstance();\r
-                mAbstract.setStringValue(this.jTextFieldAbstract.getText());\r
-                mAbstract.setURL(this.jTextFieldAbstractURL.getText());\r
-                this.msaLibHeader.setAbstract(mAbstract);\r
+                \r
+                this.msaLibHeader.setAbstract(this.jTextFieldAbstract.getText());\r

             }\r
 \r
             this.msaLibHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()\r
             }\r
 \r
             this.msaLibHeader.setModuleType(ModuleTypeDef.Enum.forString(this.jComboBoxModuleType.getSelectedItem()\r

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
 \r
     private GuidDocument.Guid spdHdrGuid = null;\r
 \r

-    private AbstractDocument.Abstract spdHdrAbs = null;\r
-\r

     private LicenseDocument.License spdHdrLicense = 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
     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[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
         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
      \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
     }\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
      @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
     }\r
 \r
     /**\r


@@ -1128,7 +1116,7 @@ public class SpdFileContents {
    **/\r
     public void setSpdHdrVer(String ver) {\r
         if (spdHdr != null) {\r
    **/\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
         }\r
 \r
     }\r


@@ -1211,15 +1199,7 @@ public class SpdFileContents {
         }\r
     }\r
 \r
         }\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
     /**\r
     Reserved method\r
     \r


@@ -1229,12 +1209,9 @@ public class SpdFileContents {
         if (spec == null) {\r
             return;\r
         }\r
         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
     }\r
 \r
     /**\r