1. Fix EDKT230 "A library class should not be specified for a module more than one...

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / Identifications / LibraryClass / LibraryClassVector.java

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
index f7af757458b309233cad2c3be89cf71d18618338..56490a284fcbb1360d1e1c01b884cd4333da4e0b 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
@@ -21,12 +21,7 @@ public class LibraryClassVector {
     private Vector<LibraryClassIdentification> vLibraryClass = new Vector<LibraryClassIdentification>();\r
     \r
     public int findLibraryClass(LibraryClassIdentification lib) {\r
-        for (int index = 0; index < vLibraryClass.size(); index++) {\r
-            if (vLibraryClass.elementAt(index).equals(lib)) {\r
-                return index;\r
-            }\r
-        }\r
-        return -1;\r
+        return findLibraryClass(lib.getLibraryClassName());\r
     }\r
     \r
     public int findLibraryClass(String name) {\r
@@ -47,10 +42,12 @@ public class LibraryClassVector {
     }\r
     \r
     public void addLibraryClass(LibraryClassIdentification lib) {\r
-        vLibraryClass.addElement(lib);\r
+        if (findLibraryClass(lib) == -1) {\r
+            vLibraryClass.addElement(lib);\r
+        }\r
     }\r
     \r
-    public void updateLibraryClass(LibraryClassIdentification lib, int index) {\r
+    public void setLibraryClass(LibraryClassIdentification lib, int index) {\r
         vLibraryClass.setElementAt(lib, index);\r
     }\r
     \r
@@ -86,4 +83,11 @@ public class LibraryClassVector {
     public int size() {\r
         return this.vLibraryClass.size();\r
     }\r
+    \r
+    public Vector<String> toStringVector(int index) {\r
+        Vector<String> v = new Vector<String>();\r
+        v.addElement(getLibraryClass(index).getLibraryClassName());\r
+        v.addElement(getLibraryClass(index).getUsage());\r
+        return v;\r
+    }\r
 }\r