Fix several issues:

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

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
index 5c2eaf0caf97c8bb62cb310da71a2fe87d58195a..d2c20b3b2322c2d0de43c5ccc5ab6fdf09eeb0db 100644 (file)
--- a/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
+++ b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
@@ -61,19 +61,35 @@ public class MsaOwner {
     //-----------------------------msaheader-------------------------------------//\r
 \r
     public final boolean addLibraryClass (String name, UsageTypes.Enum usage) {\r
-        Iterator<LibraryClassDocument.LibraryClass> classit = libclassdefs.getLibraryClassList().iterator();\r
-        while (classit.hasNext()) {\r
-            if (classit.next().getKeyword() == name) {\r
-                MigrationTool.ui.println ("Warning: Duplicate LibraryClass");\r
-                return false;\r
+       /*\r
+       if (!libclassdefs.getLibraryClassList().contains(name)) {\r
+            LibraryClassDocument.LibraryClass classname;\r
+            classname = libclassdefs.addNewLibraryClass();\r
+            classname.setKeyword(name);\r
+            classname.setUsage(usage);\r
+            return true;\r
+       } else {\r
+               return false;\r
+       }\r
+       */\r
+       if (name == null) {\r
+               return false;\r
+       } else {\r
+            Iterator<LibraryClassDocument.LibraryClass> classit = libclassdefs.getLibraryClassList().iterator();\r
+            while (classit.hasNext()) {\r
+                if (classit.next().getKeyword().matches(name)) {\r
+                    //MigrationTool.ui.println ("Warning: Duplicate LibraryClass");\r
+                    return false;\r
+                }\r
             }\r
-        }\r
-        \r
-        LibraryClassDocument.LibraryClass classname;\r
-        classname = libclassdefs.addNewLibraryClass();\r
-        classname.setKeyword(name);\r
-        classname.setUsage(usage);\r
-        return true;\r
+            \r
+            LibraryClassDocument.LibraryClass classname;\r
+            classname = libclassdefs.addNewLibraryClass();\r
+            classname.setKeyword(name);\r
+            classname.setUsage(usage);\r
+            return true;\r
+            \r
+       }\r
     }\r
     \r
     public final boolean addGuid (String guidname, UsageTypes.Enum usage) {\r
@@ -84,7 +100,7 @@ public class MsaOwner {
         Iterator<GuidsDocument.Guids.GuidCNames> guidit = guids.getGuidCNamesList().iterator();\r
         while (guidit.hasNext()) {\r
             if (guidit.next().getGuidCName() == guidname) {\r
-                MigrationTool.ui.println ("Warning: Duplicate Guid");\r
+                //MigrationTool.ui.println ("Warning: Duplicate Guid");\r
                 return false;\r
             }\r
         }\r
@@ -105,7 +121,7 @@ public class MsaOwner {
         Iterator<PPIsDocument.PPIs.Ppi> ppiit = ppis.getPpiList().iterator();\r
         while (ppiit.hasNext()) {\r
             if (ppiit.next().getPpiCName() == ppiname) {\r
-                MigrationTool.ui.println ("Warning: Duplicate Ppi");\r
+                //MigrationTool.ui.println ("Warning: Duplicate Ppi");\r
                 return false;\r
             }\r
         }\r
@@ -117,31 +133,6 @@ public class MsaOwner {
         return true;\r
     }\r
     \r
-    /*\r
-    private final boolean installProtocols () {\r
-        if (mapprotocols.isEmpty()) {\r
-            return false;\r
-        }\r
-        Set<String> setprotocols = mapprotocols.keySet();\r
-        ProtocolsDocument.Protocols.Protocol protocol;\r
-        Iterator<String> it = setprotocols.iterator();\r
-        while (it.hasNext()) {\r
-            protocol = protocols.addNewProtocol();\r
-            protocol.setProtocolCName(it.next());\r
-            protocol.setUsage(mapprotocols.get(protocol.getProtocolCName()));\r
-        }\r
-        return true;\r
-    }\r
-    \r
-    public final boolean addProtocols (String protocol, UsageTypes.Enum usage) {\r
-        if (mapprotocols.containsKey(protocol)) {\r
-            return false;\r
-        } else {\r
-            mapprotocols.put(protocol, usage);\r
-            return true;\r
-        }\r
-    }\r
-    */\r
     public final boolean addProtocol (String proname, UsageTypes.Enum usage) {\r
         if (protocols == null) {\r
             protocols = msa.addNewProtocols();\r
@@ -150,7 +141,7 @@ public class MsaOwner {
         Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator();\r
         while (proit.hasNext()) {\r
             if (proit.next().getProtocolCName() == proname) {\r
-                MigrationTool.ui.println ("Warning: Duplicate Protocol");\r
+                //MigrationTool.ui.println ("Warning: Duplicate Protocol");\r
                 return false;\r
             }\r
         }\r
@@ -162,33 +153,6 @@ public class MsaOwner {
         return true;\r
     }\r
     \r
-    /*\r
-    private final boolean installHashFilename () {\r
-        if (mapfilenames.isEmpty()) {\r
-            return false;\r
-        }\r
-        Set<String> setfilename = mapfilenames.keySet();\r
-        FilenameDocument.Filename filename;\r
-        List<Enum> arch = new ArrayList<Enum>();\r
-        Iterator<String> it = setfilename.iterator();\r
-        while (it.hasNext()) {\r
-            filename = sourcefiles.addNewFilename();\r
-            filename.setStringValue(it.next());\r
-            arch.add(mapfilenames.get(filename.getStringValue()));\r
-            filename.setSupArchList(arch);\r
-        }\r
-        return true;\r
-    }\r
-    \r
-    public final boolean addSourceFile (String filename, Enum arch) {        // dummy & null how to imply?\r
-        if (mapfilenames.containsKey(filename)) {\r
-            return false;\r
-        } else {\r
-            mapfilenames.put(filename, arch);\r
-            return true;\r
-        }\r
-    }\r
-    */\r
     public final boolean addSourceFile (String name, Enum en) {\r
         Iterator<FilenameDocument.Filename> fileit = sourcefiles.getFilenameList().iterator();\r
         while (fileit.hasNext()) {\r
@@ -375,6 +339,15 @@ public class MsaOwner {
     }\r
     //-----------------------------msaheader-------------------------------------//\r
     \r
+    private final void fullfill () throws Exception {\r
+       addCopyRight(null);\r
+       addVersion(null);\r
+       addAbstract(null);\r
+       addDescription(null);\r
+       addLicense(null);\r
+       addSpecification(null);\r
+    }\r
+    \r
     public final void flush(String outputpath) throws Exception {\r
         XmlOptions options = new XmlOptions();\r
 \r
@@ -384,6 +357,7 @@ public class MsaOwner {
         options.setUseDefaultNamespace();\r
         \r
         BufferedWriter bw = new BufferedWriter(new FileWriter(outputpath));\r
+        fullfill();\r
         msadoc.save(bw, options);\r
         bw.flush();\r
         bw.close();\r