MsaOwner usable

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index b6cd6330d4a979fb0f6956bed2b747c9df0560a4..aa19522e02d1dd2af8e75ef9187c9a8485678495 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -15,7 +15,7 @@ package org.tianocore.migration;
 import java.io.*;\r
 import java.util.*;\r
 \r
-import org.tianocore.ModuleSurfaceAreaDocument;\r
+import org.tianocore.UsageTypes;\r
 \r
 /*\r
     Class ModuleInfo is built for scanning the source files, it contains all the needed\r
@@ -30,8 +30,7 @@ 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
+    private MsaOwner msaowner = MsaOwner.initNewMsaOwner();\r
     \r
     public String modulename = null;\r
     public String guidvalue = null;\r
@@ -53,10 +52,34 @@ public final class ModuleInfo {
     public final Set<String> hashmacro = new HashSet<String>();\r
     \r
     public final Set<String> hashrequiredr9libs = new HashSet<String>();    // hashrequiredr9libs is now all added in SourceFileReplacer \r
-    public final Set<String> guid = new HashSet<String>();\r
-    public final Set<String> protocol = new HashSet<String>();\r
-    public final Set<String> ppi = new HashSet<String>();\r
+    public final Set<String> guids = new HashSet<String>();\r
+    public final Set<String> protocols = new HashSet<String>();\r
+    public final Set<String> ppis = new HashSet<String>();\r
 \r
+    //-----------------------------------------------------------------------------------//\r
+\r
+    public final boolean addProtocol (String proname, UsageTypes.Enum usage) {\r
+        //protocols.add(proname);\r
+        return msaowner.addProtocol(proname, usage);\r
+    }\r
+    \r
+    public final boolean addPpi (String ppiname, UsageTypes.Enum usage) {\r
+        //ppis.add(ppiname);\r
+        return msaowner.addPpi(ppiname, usage);\r
+    }\r
+    \r
+    public final boolean addGuid (String guidname, UsageTypes.Enum usage) {\r
+        //guids.add(guidname);\r
+        return msaowner.addGuid(guidname, usage);\r
+    }\r
+    \r
+    public final boolean addLibraryClass(String name, UsageTypes.Enum usage) {\r
+        //hashrequiredr9libs.add(name);\r
+        return msaowner.addLibraryClass(name, usage);\r
+    }\r
+    \r
+    //-----------------------------------------------------------------------------------//\r
+    \r
     public final String getModuleType() {\r
         if (moduletype.contains("PEI")) {\r
             return "PEIM";\r
@@ -89,4 +112,8 @@ public final class ModuleInfo {
         }\r
         return false;\r
     }\r
+    \r
+    public final MsaOwner getMsaOwner() {\r
+        return msaowner;\r
+    }\r
 }
\ No newline at end of file