1. Fix EDKT339 Library Class Search need to get info for selected library class

[mirror_edk2.git] / Tools / Java / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / module / ui / dialog / LibraryClassDefsDlg.java

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
index 0c8d66343427db8aa3e63f6c5a2d953cc2378ac6..854c6514d5964e11928732376a46610890db5ba5 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java
@@ -505,32 +505,6 @@ public class LibraryClassDefsDlg extends IDialog {
             Log.wrn("Update Library Class Definitions", "Incorrect data type for Library Class");\r
             return false;\r
         }\r
-\r
-        //\r
-        // Check if the library is produced\r
-        //\r
-        String strUsage = this.jComboBoxUsage.getSelectedItem().toString();\r
-        //\r
-        // Check only when the library class is consumed\r
-        //\r
-        if (strUsage.equals(DataType.USAGE_TYPE_ALWAYS_CONSUMED) || strUsage.equals(DataType.USAGE_TYPE_SOMETIMES_CONSUMED)) {\r
-            LibraryClassVector v = Find.getAllLibraryClassVector();\r
-            boolean isFind = false;\r
-            for (int index = 0; index < v.size(); index++) {\r
-                LibraryClassIdentification lid = v.getLibraryClass(index);\r
-                if (lid.getLibraryClassName().equals(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r
-                    if (lid.getUsage().equals(DataType.USAGE_TYPE_ALWAYS_PRODUCED)\r
-                        || lid.getUsage().equals(DataType.USAGE_TYPE_SOMETIMES_PRODUCED)) {\r
-                        isFind = true;\r
-                        break;\r
-                    }\r
-                }\r
-            }\r
-            if (!isFind) {\r
-                Log.wrn("Update Library Class Definitions", "This Library Class has no instance yet.");\r
-                return false;\r
-            }\r
-        }\r
         \r
         //\r
         // Check RecommendedInstanceVersion\r
@@ -561,6 +535,32 @@ public class LibraryClassDefsDlg extends IDialog {
                 return false;\r
             }\r
         }\r
+        \r
+        //\r
+        // Check if the library is produced\r
+        //\r
+        String strUsage = this.jComboBoxUsage.getSelectedItem().toString();\r
+        //\r
+        // Check only when the library class is consumed\r
+        //\r
+        if (strUsage.equals(DataType.USAGE_TYPE_ALWAYS_CONSUMED) || strUsage.equals(DataType.USAGE_TYPE_SOMETIMES_CONSUMED)) {\r
+            LibraryClassVector v = Find.getAllLibraryClassVector();\r
+            boolean isFind = false;\r
+            for (int index = 0; index < v.size(); index++) {\r
+                LibraryClassIdentification lid = v.getLibraryClass(index);\r
+                if (lid.getLibraryClassName().equals(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r
+                    if (lid.getUsage().equals(DataType.USAGE_TYPE_ALWAYS_PRODUCED)\r
+                        || lid.getUsage().equals(DataType.USAGE_TYPE_SOMETIMES_PRODUCED)) {\r
+                        isFind = true;\r
+                        break;\r
+                    }\r
+                }\r
+            }\r
+            if (!isFind) {\r
+                Log.wrn("Update Library Class Definitions", "This Library Class has no instance yet. It may have some errors in build time.");\r
+                //return false;\r
+            }\r
+        }\r
 \r
         return true;\r
     }\r