remove unnecessary check for NULL pointer.

[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..5c48303a26c079089596427645a4d0332bb00266 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
@@ -32,6 +32,7 @@ import org.tianocore.frameworkwizard.common.Log;
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.find.Find;\r
 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;\r
+import org.tianocore.frameworkwizard.common.ui.IComboBox;\r
 import org.tianocore.frameworkwizard.common.ui.IDialog;\r
 import org.tianocore.frameworkwizard.common.ui.IFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
@@ -60,7 +61,7 @@ public class LibraryClassDefsDlg extends IDialog {
     //\r
     private JPanel jContentPane = null;\r
 \r
-    private JComboBox jComboBoxLibraryClassName = null;\r
+    private IComboBox iComboBoxLibraryClassName = null;\r
 \r
     private JLabel jLabelUsage = null;\r
 \r
@@ -121,14 +122,14 @@ public class LibraryClassDefsDlg extends IDialog {
      @return javax.swing.JComboBox jComboBoxSelect\r
      \r
      **/\r
-    private JComboBox getJComboBoxLibraryClassName() {\r
-        if (jComboBoxLibraryClassName == null) {\r
-            jComboBoxLibraryClassName = new JComboBox();\r
-            jComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
-            jComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));\r
-            jComboBoxLibraryClassName.setEnabled(true);\r
+    private IComboBox getIComboBoxLibraryClassName() {\r
+        if (iComboBoxLibraryClassName == null) {\r
+            iComboBoxLibraryClassName = new IComboBox();\r
+            iComboBoxLibraryClassName.setBounds(new java.awt.Rectangle(168, 12, 320, 20));\r
+            iComboBoxLibraryClassName.setPreferredSize(new Dimension(320, 20));\r
+            iComboBoxLibraryClassName.setEnabled(true);\r
         }\r
-        return jComboBoxLibraryClassName;\r
+        return iComboBoxLibraryClassName;\r
     }\r
 \r
     /**\r
@@ -349,13 +350,13 @@ public class LibraryClassDefsDlg extends IDialog {
 \r
         Tools\r
              .generateComboBoxByVector(\r
-                                       this.jComboBoxLibraryClassName,\r
+                                       this.iComboBoxLibraryClassName,\r
                                        wt\r
                                          .getAllLibraryClassDefinitionsFromPackages(wt\r
                                                                                       .getPackageDependenciesOfModule(mid)));\r
 \r
         if (lcid != null) {\r
-            this.jComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());\r
+            this.iComboBoxLibraryClassName.setSelectedItem(lcid.getLibraryClassName());\r
             this.jComboBoxUsage.setSelectedItem(lcid.getUsage());\r
             this.jTextFieldRecommendedInstanceVersion.setText(lcid.getRecommendedInstanceVersion());\r
             this.jTextFieldRecommendedInstanceGuid.setText(lcid.getRecommendedInstanceGuid());\r
@@ -375,7 +376,7 @@ public class LibraryClassDefsDlg extends IDialog {
      **/\r
     public void setViewMode(boolean isView) {\r
         if (isView) {\r
-            this.jComboBoxLibraryClassName.setEnabled(!isView);\r
+            this.iComboBoxLibraryClassName.setEnabled(!isView);\r
             this.jComboBoxUsage.setEnabled(!isView);\r
         }\r
     }\r
@@ -422,7 +423,7 @@ public class LibraryClassDefsDlg extends IDialog {
             jContentPane.setLayout(null);\r
             jContentPane.setPreferredSize(new java.awt.Dimension(495, 255));\r
 \r
-            jContentPane.add(getJComboBoxLibraryClassName(), null);\r
+            jContentPane.add(getIComboBoxLibraryClassName(), null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
             jContentPane.add(jLabelLibraryClassName, null);\r
@@ -497,40 +498,14 @@ public class LibraryClassDefsDlg extends IDialog {
         //\r
         // Check LibraryClass\r
         //\r
-        if (this.jComboBoxLibraryClassName.getSelectedItem() == null) {\r
+        if (this.iComboBoxLibraryClassName.getSelectedItem() == null) {\r
             Log.wrn("Update Library Class Definitions", "Please select one Library Class");\r
             return false;\r
         }\r
-        if (!DataValidation.isLibraryClass(this.jComboBoxLibraryClassName.getSelectedItem().toString())) {\r
+        if (!DataValidation.isLibraryClass(this.iComboBoxLibraryClassName.getSelectedItem().toString())) {\r
             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,12 +536,38 @@ 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.iComboBoxLibraryClassName.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
 \r
     private LibraryClassIdentification getCurrentLibraryClass() {\r
-        String name = this.jComboBoxLibraryClassName.getSelectedItem().toString();\r
+        String name = this.iComboBoxLibraryClassName.getSelectedItem().toString();\r
         String usage = this.jComboBoxUsage.getSelectedItem().toString();\r
         String version = this.jTextFieldRecommendedInstanceVersion.getText();\r
         String guid = this.jTextFieldRecommendedInstanceGuid.getText();\r