first step for MsaOwner in ModuleInfo

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index 0799bf5c3492766c987159ecf79ac83fa3004f4e..01aa129cd53793a9b14cd2ea3936057cc72cd74a 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -15,6 +15,8 @@ package org.tianocore.migration;
 import java.io.*;\r
 import java.util.*;\r
 \r
+import org.tianocore.ModuleSurfaceAreaDocument;\r
+\r
 /*\r
     Class ModuleInfo is built for scanning the source files, it contains all the needed\r
 information and all the temporary data.\r
@@ -28,6 +30,9 @@ public final class ModuleInfo {
     public final String modulepath;\r
     public final String temppath;\r
     \r
+    private MsaOwner msaowner = new MsaWriter(this);\r
+    public ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();\r
+    \r
     public String modulename = null;\r
     public String guidvalue = null;\r
     public String moduletype = null;\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
new file mode 100644 (file)
index 0000000..4cc133e
--- /dev/null
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
@@ -0,0 +1,5 @@
+package org.tianocore.migration;\r
+\r
+public interface MsaOwner {\r
+       public void addSourceFiles(String filename, int arch);\r
+}\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 7db15dc92c03365471f157fa94e6c8309c192dd3..15fafe381dc85b32c078936d39ab64c5a31d55ce 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -19,14 +19,14 @@ import org.tianocore.*;
 import org.tianocore.SupportedArchitectures.Enum;\r
 import org.apache.xmlbeans.*;\r
 \r
-public class MsaWriter {\r
-    MsaWriter(ModuleInfo moduleinfo) {\r
-        mi = moduleinfo;\r
-    }\r
-\r
+public class MsaWriter implements MsaOwner {\r
+       MsaWriter(ModuleInfo moduleinfo) {\r
+               mi = moduleinfo;\r
+               msadoc = mi.msadoc;\r
+       }\r
+       \r
     private ModuleInfo mi;\r
-    \r
-    private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();\r
+    private ModuleSurfaceAreaDocument msadoc;\r
     \r
     private ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = msadoc.addNewModuleSurfaceArea();\r
     private MsaHeaderDocument.MsaHeader msaheader = msa.addNewMsaHeader();\r
@@ -207,6 +207,14 @@ public class MsaWriter {
         bw.close();\r
     }\r
     \r
+    //---------------------------MsaOwner---------------------------------//\r
+       \r
+       public void addSourceFiles(String filename, int arch) {\r
+               \r
+       }\r
+\r
+    //---------------------------MsaOwner---------------------------------//\r
+    \r
     public static final void parse(String msafile) throws Exception {\r
         ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.parse(msafile);\r
         flush("c:\\temp.msa", msadoc);\r