MsaOwner usable

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 03ac23fc2c86fdb7cbe4dd41776a02c90a4da416..4e6b30c223ef888c2e60c0ae9139b94ba08418eb 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -53,14 +53,13 @@ public class MigrationTool {
         }\r
 \r
         new MsaWriter(mi).flush();\r
         }\r
 \r
         new MsaWriter(mi).flush();\r

-/*\r
+\r
+        mi.addProtocol("protocol", UsageTypes.ALWAYS_CONSUMED);\r

         mi.addGuid("guid", UsageTypes.ALWAYS_CONSUMED);\r
         mi.addLibraryClass("class", UsageTypes.ALWAYS_CONSUMED);\r
         mi.addPpi("ppi", UsageTypes.ALWAYS_CONSUMED);\r
         mi.addGuid("guid", UsageTypes.ALWAYS_CONSUMED);\r
         mi.addLibraryClass("class", UsageTypes.ALWAYS_CONSUMED);\r
         mi.addPpi("ppi", UsageTypes.ALWAYS_CONSUMED);\r

-        mi.addProtocol("protocol", UsageTypes.ALWAYS_CONSUMED);\r
-*/\r

         mi.getMsaOwner().flush(MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + mi.modulename + ".___");\r
         mi.getMsaOwner().flush(MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + mi.modulename + ".___");\r

-     \r
+        \r

         if (MigrationTool.doCritic) {\r
             Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);\r
         }\r
         if (MigrationTool.doCritic) {\r
             Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);\r
         }\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
index dd106d5eb919b5d4ddd914dc1d2981ef34490830..aa19522e02d1dd2af8e75ef9187c9a8485678495 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/ModuleInfo.java
@@ -60,7 +60,6 @@ public final class ModuleInfo {
 \r
     public final boolean addProtocol (String proname, UsageTypes.Enum usage) {\r
         //protocols.add(proname);\r
 \r
     public final boolean addProtocol (String proname, UsageTypes.Enum usage) {\r
         //protocols.add(proname);\r

-        System.out.println("I'm in");\r

         return msaowner.addProtocol(proname, usage);\r
     }\r
     \r
         return msaowner.addProtocol(proname, usage);\r
     }\r
     \r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java b/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
index 6483de59c5064137e25f0c03ed25d4bebf89a4b9..65873a3c69fdbc459d1e2650115541572a4f2ab8 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
@@ -58,11 +58,9 @@ public class MsaOwner {
         }\r
         \r
         LibraryClassDocument.LibraryClass classname;\r
         }\r
         \r
         LibraryClassDocument.LibraryClass classname;\r

-        List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();\r

         classname = libclassdefs.addNewLibraryClass();\r
         classname.setKeyword(name);\r
         classname = libclassdefs.addNewLibraryClass();\r
         classname.setKeyword(name);\r

-        arch.add(usage);\r
-        classname.setSupArchList(arch);\r
+        classname.setUsage(usage);\r

         return true;\r
     }\r
     \r
         return true;\r
     }\r
     \r


@@ -80,11 +78,9 @@ public class MsaOwner {
         }\r
         \r
         GuidsDocument.Guids.GuidCNames guid;\r
         }\r
         \r
         GuidsDocument.Guids.GuidCNames guid;\r

-        List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();\r

         guid = guids.addNewGuidCNames();\r
         guid.setGuidCName(guidname);\r
         guid = guids.addNewGuidCNames();\r
         guid.setGuidCName(guidname);\r

-        arch.add(usage);\r
-        guid.setSupArchList(arch);\r
+        guid.setUsage(usage);\r

         return true;\r
     }\r
     \r
         return true;\r
     }\r
     \r


@@ -103,11 +99,9 @@ public class MsaOwner {
         }\r
         \r
         PPIsDocument.PPIs.Ppi ppi;\r
         }\r
         \r
         PPIsDocument.PPIs.Ppi ppi;\r

-        List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();\r

         ppi = ppis.addNewPpi();\r
         ppi.setPpiCName(ppiname);\r
         ppi = ppis.addNewPpi();\r
         ppi.setPpiCName(ppiname);\r

-        arch.add(usage);\r
-        ppi.setSupArchList(arch);\r
+        ppi.setUsage(usage);\r

         return true;\r
     }\r
     \r
         return true;\r
     }\r
     \r


@@ -140,7 +134,7 @@ public class MsaOwner {
         if (protocols == null) {\r
             protocols = msa.addNewProtocols();\r
         }\r
         if (protocols == null) {\r
             protocols = msa.addNewProtocols();\r
         }\r

-        \r
+\r

         Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator();\r
         while (proit.hasNext()) {\r
             if (proit.next().getProtocolCName() == proname) {\r
         Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator();\r
         while (proit.hasNext()) {\r
             if (proit.next().getProtocolCName() == proname) {\r


@@ -148,13 +142,11 @@ public class MsaOwner {
                 return false;\r
             }\r
         }\r
                 return false;\r
             }\r
         }\r

-        \r
+\r

         ProtocolsDocument.Protocols.Protocol protocol;\r
         ProtocolsDocument.Protocols.Protocol protocol;\r

-        List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();\r

         protocol = protocols.addNewProtocol();\r
         protocol.setProtocolCName(proname);\r
         protocol = protocols.addNewProtocol();\r
         protocol.setProtocolCName(proname);\r

-        arch.add(usage);\r
-        protocol.setSupArchList(arch);\r
+        protocol.setUsage(usage);\r

         return true;\r
     }\r
     \r
         return true;\r
     }\r
     \r