1. Fix EDKT303: Give warning if no library instances that support the required the...

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
index 56490a284fcbb1360d1e1c01b884cd4333da4e0b..fa03258bdc33ef86643200b2c24d04becc21404a 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/LibraryClass/LibraryClassVector.java
@@ -16,14 +16,19 @@ package org.tianocore.frameworkwizard.module.Identifications.LibraryClass;
 \r
 import java.util.Vector;\r
 \r
-\r
 public class LibraryClassVector {\r
     private Vector<LibraryClassIdentification> vLibraryClass = new Vector<LibraryClassIdentification>();\r
-    \r
+\r
     public int findLibraryClass(LibraryClassIdentification lib) {\r
-        return findLibraryClass(lib.getLibraryClassName());\r
+        for (int index = 0; index < vLibraryClass.size(); index++) {\r
+            if (vLibraryClass.elementAt(index).getLibraryClassName().equals(lib.getLibraryClassName())\r
+                && vLibraryClass.elementAt(index).getUsage().equals(lib.getUsage())) {\r
+                return index;\r
+            }\r
+        }\r
+        return -1;\r
     }\r
-    \r
+\r
     public int findLibraryClass(String name) {\r
         for (int index = 0; index < vLibraryClass.size(); index++) {\r
             if (vLibraryClass.elementAt(index).getLibraryClassName().equals(name)) {\r
@@ -32,7 +37,7 @@ public class LibraryClassVector {
         }\r
         return -1;\r
     }\r
-    \r
+\r
     public LibraryClassIdentification getLibraryClass(int index) {\r
         if (index > -1) {\r
             return vLibraryClass.elementAt(index);\r
@@ -40,24 +45,24 @@ public class LibraryClassVector {
             return null;\r
         }\r
     }\r
-    \r
+\r
     public void addLibraryClass(LibraryClassIdentification lib) {\r
         if (findLibraryClass(lib) == -1) {\r
             vLibraryClass.addElement(lib);\r
         }\r
     }\r
-    \r
+\r
     public void setLibraryClass(LibraryClassIdentification lib, int index) {\r
         vLibraryClass.setElementAt(lib, index);\r
     }\r
-    \r
+\r
     public void removeLibraryClass(LibraryClassIdentification lib) {\r
         int index = findLibraryClass(lib);\r
         if (index > -1) {\r
             vLibraryClass.removeElementAt(index);\r
         }\r
     }\r
-    \r
+\r
     public void removeLibraryClass(int index) {\r
         if (index > -1 && index < this.size()) {\r
             vLibraryClass.removeElementAt(index);\r
@@ -71,7 +76,7 @@ public class LibraryClassVector {
     public void setVLibraryClass(Vector<LibraryClassIdentification> libraryClass) {\r
         vLibraryClass = libraryClass;\r
     }\r
-    \r
+\r
     public Vector<String> getLibraryClassName() {\r
         Vector<String> v = new Vector<String>();\r
         for (int index = 0; index < this.vLibraryClass.size(); index++) {\r
@@ -79,11 +84,11 @@ public class LibraryClassVector {
         }\r
         return v;\r
     }\r
-    \r
+\r
     public int size() {\r
         return this.vLibraryClass.size();\r
     }\r
-    \r
+\r
     public Vector<String> toStringVector(int index) {\r
         Vector<String> v = new Vector<String>();\r
         v.addElement(getLibraryClass(index).getLibraryClassName());\r