1. Merge ModuleDefinitions to MsaHeader

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / SelectModuleBelong.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index 3e081969386a235de36b2fc618dcb510fdfdaf39..f5ba066b2f651a00a31e95bb534832e2429fbeb8 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -28,9 +28,9 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JTextField;\r
 \r
-import org.tianocore.ModuleSurfaceAreaDocument;\r
 import org.tianocore.MsaHeaderDocument;\r
 import org.tianocore.SpdHeaderDocument;\r
+import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
 import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;\r
 import org.tianocore.PlatformHeaderDocument.PlatformHeader;\r
 import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea;\r
@@ -109,6 +109,12 @@ public class SelectModuleBelong extends IDialog {
     private PackageIdentification pid = null;\r
 \r
     private PlatformIdentification fid = null;\r
+    \r
+    private ModuleSurfaceArea msa = null;\r
+    \r
+    private PackageSurfaceArea spd = null;\r
+    \r
+    private PlatformSurfaceArea fpd = null;\r
 \r
     private int mode = -1;\r
 \r
@@ -572,7 +578,7 @@ public class SelectModuleBelong extends IDialog {
      \r
      **/\r
     private void saveModule() {\r
-        ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = null;\r
+        msa = null;\r
         String path = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
 \r
         //\r
@@ -581,7 +587,7 @@ public class SelectModuleBelong extends IDialog {
         try {\r
             MsaHeaderDocument.MsaHeader msaHeader = null;\r
 \r
-            msa = ModuleSurfaceAreaDocument.ModuleSurfaceArea.Factory.newInstance();\r
+            msa = ModuleSurfaceArea.Factory.newInstance();\r
             msaHeader = MsaHeaderDocument.MsaHeader.Factory.newInstance();\r
 \r
             msaHeader.setModuleName(this.jTextFieldName.getText());\r
@@ -618,7 +624,7 @@ public class SelectModuleBelong extends IDialog {
      \r
      **/\r
     private void savePackage() {\r
-        PackageSurfaceArea spd = null;\r
+        spd = null;\r
         String path = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
 \r
         //\r
@@ -664,7 +670,7 @@ public class SelectModuleBelong extends IDialog {
      \r
      **/\r
     private void savePlatform() {\r
-        PlatformSurfaceArea fpd = null;\r
+        fpd = null;\r
         String path = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
 \r
         //\r
@@ -709,27 +715,27 @@ public class SelectModuleBelong extends IDialog {
         return mid;\r
     }\r
 \r
-    public void setMid(ModuleIdentification mid) {\r
-        this.mid = mid;\r
-    }\r
-\r
     public PlatformIdentification getFid() {\r
         return fid;\r
     }\r
 \r
-    public void setFid(PlatformIdentification fid) {\r
-        this.fid = fid;\r
-    }\r
-\r
     public PackageIdentification getPid() {\r
         return pid;\r
     }\r
 \r
-    public void setPid(PackageIdentification pid) {\r
-        this.pid = pid;\r
-    }\r
-\r
     private void upLocation(Component c, int size) {\r
         c.setLocation(c.getLocation().x, c.getLocation().y - size);\r
     }\r
+\r
+    public PlatformSurfaceArea getFpd() {\r
+        return fpd;\r
+    }\r
+\r
+    public ModuleSurfaceArea getMsa() {\r
+        return msa;\r
+    }\r
+\r
+    public PackageSurfaceArea getSpd() {\r
+        return spd;\r
+    }\r
 }\r