merged part of new changes in new schema, and changed genbuild code accordingly

[mirror_edk2.git] / Tools / Source / GenBuild / org / tianocore / build / autogen / AutogenLibOrder.java

diff --git a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
index 77404d40072f740ae5791f14bd8590a1b2fc70bd..50668b096bc88be1589d5a1e1ad152093d947a88 100644 (file)
--- a/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
+++ b/Tools/Source/GenBuild/org/tianocore/build/autogen/AutogenLibOrder.java
@@ -20,7 +20,6 @@ import java.util.ArrayList;
 import java.util.HashMap;\r
 import java.util.List;\r
 import java.util.Map;\r
-\r
 import org.apache.xmlbeans.XmlObject;\r
 import org.tianocore.LibraryClassDocument.LibraryClass;\r
 \r
@@ -81,7 +80,8 @@ public class AutogenLibOrder {
             if (libClassConsmList != null) {\r
                 String[] classStr = new String[libClassConsmList.length];\r
                 for (int k = 0; k < libClassConsmList.length; k++) {\r
-                    classStr[k] = libClassConsmList[k].getStringValue();\r
+                    //classStr[k] = libClassConsmList[k].getStringValue();\r
+                    classStr[k] = getStringValue((XmlObject)libClassConsmList[k]);\r
                 }\r
                 if (this.libInstanceMap.containsKey(libInstance[0])) {\r
                     throw new Exception(\r
@@ -99,17 +99,17 @@ public class AutogenLibOrder {
                     .getLibraryClassArray(CommonDefinition.AlwaysProduced);\r
             if (libClassDeclList != null) {\r
                 for (int j = 0; j < libClassDeclList.length; j++) {\r
-                    if (this.libClassMap.containsKey(libClassDeclList[j]\r
-                            .getStringValue())) {\r
-                        System.out.println(libClassDeclList[j].getStringValue()\r
+                    //if (this.libClassMap.containsKey(libClassDeclList[j]\r
+                    //        .getStringValue())) {\r
+                    String libClassName = getStringValue((XmlObject)libClassDeclList[j]);\r
+                    if (this.libClassMap.containsKey(libClassName)) {\r
+                        System.out.println(libClassName\r
                                 + " class is already implement by "\r
-                                + this.libClassMap.get(libClassDeclList[j]\r
-                                        .getStringValue()));\r
+                                + this.libClassMap.get(libClassName));\r
                         throw new Exception(libClassDeclList\r
                                 + " is already have library instance!");\r
                     } else {\r
-                        this.libClassMap.put(libClassDeclList[j]\r
-                                .getStringValue(), libInstance[0]);\r
+                        this.libClassMap.put(libClassName, libInstance[0]);\r
                     }\r
                 }\r
             }\r
@@ -286,6 +286,10 @@ public class AutogenLibOrder {
         }\r
         return false;\r
     }\r
+\r
+    private String getStringValue(XmlObject xmlDoc) {\r
+        return xmlDoc.getDomNode().getFirstChild().getNodeValue();\r
+    }\r
 }\r
 \r
 /**\r