enhance ModuleInfo.java

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Guid.java b/Tools/Source/MigrationTools/org/tianocore/migration/Guid.java
index 8152e7bbd4d622b5f4a5806600f58750b1b8a8bb..e6fd4c3526193156a131ce84bebcc9aa99d8014f 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Guid.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Guid.java
@@ -48,11 +48,11 @@ public class Guid {
         if (MigrationTool.db.hasGuid(temp)) {        // only changed guids registered, because both changed and not changed guids are included in database\r
             type = MigrationTool.db.getGuidType(temp);\r
             if (type.matches("Protocol")) {\r
-                mi.protocol.add(temp);\r
+                mi.protocols.add(temp);\r
             } else if (type.matches("Ppi")) {\r
-                mi.ppi.add(temp);\r
+                mi.ppis.add(temp);\r
             } else if (type.matches("Guid")) {\r
-                mi.guid.add(temp);\r
+                mi.guids.add(temp);\r
             }\r
             return temp;\r
         }\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index ee3b36f8abbdda132061dca24225726005a3cd72..016b153bf2a23e9c83423d5d07180223ce9ed63f 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -39,9 +39,9 @@ public class MigrationTool {
         if (MigrationTool.printModuleInfo) {\r
             MigrationTool.ui.println("\nModule Information : ");\r
             MigrationTool.ui.println("Entrypoint : " + mi.entrypoint);\r
-            show(mi.protocol, "Protocol : ");\r
-            show(mi.ppi, "Ppi : ");\r
-            show(mi.guid, "Guid : ");\r
+            show(mi.protocols, "Protocol : ");\r
+            show(mi.ppis, "Ppi : ");\r
+            show(mi.guids, "Guid : ");\r
             show(mi.hashfuncc, "call : ");\r
             show(mi.hashfuncd, "def : ");\r
             show(mi.hashEFIcall, "EFIcall : ");\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index cf42d9c57a4d32bd167f99f3836739ea12f38426..9624eeea54276979e1ff17249e23687b1f3ee098 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.UsageTypes;\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
@@ -50,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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
index 72fa0679762073618e0b37ba02f9cc30a875abaa..589fb568048262ec6eff9ac6bf007e4839ef6550 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaWriter.java
@@ -132,9 +132,9 @@ public class MsaWriter {
         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
@@ -143,9 +143,9 @@ public class MsaWriter {
                 }\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
@@ -154,9 +154,9 @@ public class MsaWriter {
                 }\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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
index 9d4c85cb045fe82a8226908fd847def2ea180665..01678a3d0283e17bbeeb55eaab9dcff0581f0a49 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/SourceFileReplacer.java
@@ -127,9 +127,9 @@ public final class SourceFileReplacer implements Common.ForDoAll {
             wholeline = replaceMacro (wholeline, mi.hashnonlocalmacro);\r
 \r
             // Converting guid\r
-            replaceGuid(wholeline, mi.guid, "guid", fileguid);\r
-            replaceGuid(wholeline, mi.ppi, "ppi", fileppi);\r
-            replaceGuid(wholeline, mi.protocol, "protocol", fileprotocol);\r
+            replaceGuid(wholeline, mi.guids, "guid", fileguid);\r
+            replaceGuid(wholeline, mi.ppis, "ppi", fileppi);\r
+            replaceGuid(wholeline, mi.protocols, "protocol", fileprotocol);\r
 \r
             // Converting Pei\r
             if (mi.getModuleType().matches("PEIM")) {\r