X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=Tools%2FJava%2FSource%2FMigrationTools%2Forg%2Ftianocore%2Fmigration%2FMsaOwner.java;h=7aa90da6ba9b6b3c66550af4518b792ab535ed82;hb=8270b34d9de8644edba8157839fdba0e113346d2;hp=9217857fc634efd7c7295db447218b7adef68dd7;hpb=db0e690675ba50c2463c47e4811227e56c4858d9;p=mirror_edk2.git

diff --git a/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java b/Tools/Java/Source/MigrationTools/org/tianocore/migration/MsaOwner.java
index 9217857fc6..7aa90da6ba 100644
--- 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-------------------------------------//
 
     public final boolean addLibraryClass (String name, UsageTypes.Enum usage) {
-        Iterator<LibraryClassDocument.LibraryClass> classit = libclassdefs.getLibraryClassList().iterator();
-        while (classit.hasNext()) {
-            if (classit.next().getKeyword() == name) {
-                MigrationTool.ui.println ("Warning: Duplicate LibraryClass");
-                return false;
+    	/*
+    	if (!libclassdefs.getLibraryClassList().contains(name)) {
+            LibraryClassDocument.LibraryClass classname;
+            classname = libclassdefs.addNewLibraryClass();
+            classname.setKeyword(name);
+            classname.setUsage(usage);
+            return true;
+    	} else {
+    		return false;
+    	}
+    	*/
+    	if (name == null) {
+    		return false;
+    	} else {
+            Iterator<LibraryClassDocument.LibraryClass> classit = libclassdefs.getLibraryClassList().iterator();
+            while (classit.hasNext()) {
+                if (classit.next().getKeyword().matches(name)) {
+                    //MigrationTool.ui.println ("Warning: Duplicate LibraryClass");
+                    return false;
+                }
             }
-        }
-        
-        LibraryClassDocument.LibraryClass classname;
-        classname = libclassdefs.addNewLibraryClass();
-        classname.setKeyword(name);
-        classname.setUsage(usage);
-        return true;
+            
+            LibraryClassDocument.LibraryClass classname;
+            classname = libclassdefs.addNewLibraryClass();
+            classname.setKeyword(name);
+            classname.setUsage(usage);
+            return true;
+            
+    	}
     }
     
     public final boolean addGuid (String guidname, UsageTypes.Enum usage) {
@@ -84,7 +100,7 @@ public class MsaOwner {
         Iterator<GuidsDocument.Guids.GuidCNames> guidit = guids.getGuidCNamesList().iterator();
         while (guidit.hasNext()) {
             if (guidit.next().getGuidCName() == guidname) {
-                MigrationTool.ui.println ("Warning: Duplicate Guid");
+                //MigrationTool.ui.println ("Warning: Duplicate Guid");
                 return false;
             }
         }
@@ -105,7 +121,7 @@ public class MsaOwner {
         Iterator<PPIsDocument.PPIs.Ppi> ppiit = ppis.getPpiList().iterator();
         while (ppiit.hasNext()) {
             if (ppiit.next().getPpiCName() == ppiname) {
-                MigrationTool.ui.println ("Warning: Duplicate Ppi");
+                //MigrationTool.ui.println ("Warning: Duplicate Ppi");
                 return false;
             }
         }
@@ -150,7 +166,7 @@ public class MsaOwner {
         Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator();
         while (proit.hasNext()) {
             if (proit.next().getProtocolCName() == proname) {
-                MigrationTool.ui.println ("Warning: Duplicate Protocol");
+                //MigrationTool.ui.println ("Warning: Duplicate Protocol");
                 return false;
             }
         }
@@ -225,8 +241,14 @@ public class MsaOwner {
     }
     
     public final boolean setupPackageDependencies() {
-        addPackage("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");
-        addPackage("68169ab0-d41b-4009-9060-292c253ac43d");
+        Iterator<String> it;
+        //
+        // For now, simply add all package guids in the database. 
+        // 
+        it = MigrationTool.db.dumpAllPkgGuid();
+        while (it.hasNext()) {
+            packagedependencies.addNewPackage().setPackageGuid(it.next());
+        }
         return true;
     }
     
@@ -369,6 +391,15 @@ public class MsaOwner {
     }
     //-----------------------------msaheader-------------------------------------//
     
+    private final void fullfill () throws Exception {
+    	addCopyRight(null);
+    	addVersion(null);
+    	addAbstract(null);
+    	addDescription(null);
+    	addLicense(null);
+    	addSpecification(null);
+    }
+    
     public final void flush(String outputpath) throws Exception {
         XmlOptions options = new XmlOptions();
 
@@ -378,6 +409,7 @@ public class MsaOwner {
         options.setUseDefaultNamespace();
         
         BufferedWriter bw = new BufferedWriter(new FileWriter(outputpath));
+        fullfill();
         msadoc.save(bw, options);
         bw.flush();
         bw.close();