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 3d5a696954ea12a71d0722224d76815d8aadf9bd..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
@@ -472,19 +478,19 @@ public class SelectModuleBelong extends IDialog {
         // Check if all required fields are not empty\r
         //\r
         if (isEmpty(this.jTextFieldFilePath.getText())) {\r
-            Log.err("File Path couldn't be empty");\r
+            Log.wrn("New File", "File Path couldn't be empty");\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldName.getText())) {\r
-            Log.err("Name couldn't be empty");\r
+            Log.wrn("New File", "Name couldn't be empty");\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
-            Log.err("Guid Value couldn't be empty");\r
+            Log.wrn("New File", "Guid Value couldn't be empty");\r
             return false;\r
         }\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
-            Log.err("Version couldn't be empty");\r
+            Log.wrn("New File", "Version couldn't be empty");\r
             return false;\r
         }\r
 \r
@@ -492,11 +498,11 @@ public class SelectModuleBelong extends IDialog {
         // Check if all fields have correct data types \r
         //\r
         if (!DataValidation.isBaseName(this.jTextFieldName.getText())) {\r
-            Log.err("Incorrect data type for Base Name");\r
+            Log.wrn("New File", "Incorrect data type for Base Name");\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
-            Log.err("Incorrect data type for Guid");\r
+            Log.wrn("New File", "Incorrect data type for Guid");\r
             return false;\r
         }\r
 \r
@@ -510,7 +516,7 @@ public class SelectModuleBelong extends IDialog {
 \r
             for (int index = 0; index < msaFile.size(); index++) {\r
                 if (msaFile.elementAt(index).equals(modulePath)) {\r
-                    Log.err("This module is already existing in selected package");\r
+                    Log.wrn("New File", "This module is already existing in selected package");\r
                     return false;\r
                 }\r
             }\r
@@ -525,7 +531,7 @@ public class SelectModuleBelong extends IDialog {
             if (vPackageList != null && vPackageList.size() > 0) {\r
                 for (int index = 0; index < vPackageList.size(); index++) {\r
                     if (vPackageList.get(index).getPath().equals(path)) {\r
-                        Log.err("This package is already existing in database");\r
+                        Log.wrn("New File", "This package is already existing in database");\r
                         return false;\r
                     }\r
                 }\r
@@ -541,7 +547,7 @@ public class SelectModuleBelong extends IDialog {
             if (vPlatfromList != null && vPlatfromList.size() > 0) {\r
                 for (int index = 0; index < vPlatfromList.size(); index++) {\r
                     if (vPlatfromList.get(index).getPath().equals(path)) {\r
-                        Log.err("This platform is already existing in database");\r
+                        Log.wrn("New File", "This platform is already existing in database");\r
                         return false;\r
                     }\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
@@ -599,8 +605,8 @@ public class SelectModuleBelong extends IDialog {
         //\r
         try {\r
             SaveFile.saveMsaFile(path, msa);\r
-\r
         } catch (Exception e) {\r
+            Log.wrn("Save Module to file system", e.getMessage());\r
             Log.err("Save Module to file system", e.getMessage());\r
             return;\r
         }\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
@@ -636,7 +642,7 @@ public class SelectModuleBelong extends IDialog {
 \r
             spd.setSpdHeader(spdHeader);\r
         } catch (Exception e) {\r
-            Log.err("Save PackageSurfaceArea Document", e.getMessage());\r
+            Log.wrn("Save PackageSurfaceArea Document", e.getMessage());\r
             return;\r
         }\r
 \r
@@ -647,6 +653,7 @@ public class SelectModuleBelong extends IDialog {
             SaveFile.saveSpdFile(path, spd);\r
 \r
         } catch (Exception e) {\r
+            Log.wrn("Save Package to file system", e.getMessage());\r
             Log.err("Save Package to file system", e.getMessage());\r
             return;\r
         }\r
@@ -663,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
@@ -681,7 +688,7 @@ public class SelectModuleBelong extends IDialog {
 \r
             fpd.setPlatformHeader(fpdHeader);\r
         } catch (Exception e) {\r
-            Log.err("Save FrameworkPlatformDescription Document", e.getMessage());\r
+            Log.wrn("Save FrameworkPlatformDescription Document", e.getMessage());\r
             return;\r
         }\r
 \r
@@ -692,6 +699,7 @@ public class SelectModuleBelong extends IDialog {
             SaveFile.saveFpdFile(path, fpd);\r
 \r
         } catch (Exception e) {\r
+            Log.wrn("Save Platform to file system", e.getMessage());\r
             Log.err("Save Platform to file system", e.getMessage());\r
             return;\r
         }\r
@@ -707,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