MsaOwner.java & ModuleInfo.java

[mirror_edk2.git] / Tools / Source / MigrationTools / org / tianocore / migration / MsaWriter.java

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 2da3c98a23d79a659aba97d1ea90cea90e8854ab..3db25079057b4d98851bbd705448a9ce6693b4fd 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -19,12 +19,11 @@ import org.tianocore.*;
 import org.tianocore.SupportedArchitectures.Enum;\r
 import org.apache.xmlbeans.*;\r
 \r
-public class MsaWriter implements MsaOwner {\r
-       MsaWriter(ModuleInfo moduleinfo) {\r
-               mi = moduleinfo;\r
-               //msadoc = mi.msadoc;\r
-       }\r
-       \r
+public class MsaWriter {\r
+    MsaWriter(ModuleInfo moduleinfo) {\r
+        mi = moduleinfo;\r
+    }\r
+    \r
     private ModuleInfo mi;\r
     private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();\r
     \r
@@ -120,22 +119,22 @@ public class MsaWriter implements MsaOwner {
         externs.addNewSpecification().setStringValue("EFI_SPECIFICATION_VERSION 0x00020000");\r
         externs.addNewSpecification().setStringValue("EDK_RELEASE_VERSION 0x00020000");\r
         if (mi.entrypoint != null) {\r
-          externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
-          org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();\r
-          if (moduleType == ModuleTypeDef.PEIM) {\r
-              mi.hashrequiredr9libs.add("PeimEntryPoint");\r
-          } else {\r
-              mi.hashrequiredr9libs.add("UefiDriverEntryPoint");\r
-          }\r
+            externs.addNewExtern().setModuleEntryPoint(mi.entrypoint);\r
+            org.tianocore.ModuleTypeDef.Enum moduleType = msaheader.getModuleType();\r
+            if (moduleType == ModuleTypeDef.PEIM) {\r
+                mi.hashrequiredr9libs.add("PeimEntryPoint");\r
+            } else {\r
+                mi.hashrequiredr9libs.add("UefiDriverEntryPoint");\r
+            }\r
         }\r
        \r
         it = mi.localmodulesources.iterator();\r
         while (it.hasNext()) {\r
             addSourceFiles(it.next());\r
         }\r
-        if (!mi.protocol.isEmpty()) {\r
+        if (!mi.protocols.isEmpty()) {\r
             protocols = msa.addNewProtocols();\r
-            it = mi.protocol.iterator();\r
+            it = mi.protocols.iterator();\r
             while (it.hasNext()) {\r
                 if ((temp = it.next()) != null) {\r
                     ProtocolsDocument.Protocols.Protocol pr = protocols.addNewProtocol();\r
@@ -144,9 +143,9 @@ public class MsaWriter implements MsaOwner {
                 }\r
             }\r
         }\r
-        if (!mi.ppi.isEmpty()) {\r
+        if (!mi.ppis.isEmpty()) {\r
             ppis = msa.addNewPPIs();\r
-            it = mi.ppi.iterator();\r
+            it = mi.ppis.iterator();\r
             while (it.hasNext()) {\r
                 if ((temp = it.next()) != null) {\r
                     PPIsDocument.PPIs.Ppi pp = ppis.addNewPpi();\r
@@ -155,9 +154,9 @@ public class MsaWriter implements MsaOwner {
                 }\r
             }\r
         }\r
-        if (!mi.guid.isEmpty()) {\r
+        if (!mi.guids.isEmpty()) {\r
             guids = msa.addNewGuids();\r
-            it = mi.guid.iterator();\r
+            it = mi.guids.iterator();\r
             while (it.hasNext()) {\r
                 if ((temp = it.next()) != null) {\r
                     GuidsDocument.Guids.GuidCNames gcn = guids.addNewGuidCNames();\r
@@ -206,15 +205,7 @@ public class MsaWriter implements MsaOwner {
         bw.flush();\r
         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