1. Restructure some folders and files

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
index 81f2df92ffb314028196b36030a58f7193c7c847..7bbf1190b7f563a346387cedb84f03517c575bbd 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
@@ -36,13 +36,14 @@ import org.tianocore.frameworkwizard.common.DataType;
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.EnumerationData;\r
 import org.tianocore.frameworkwizard.common.Log;\r
-import org.tianocore.frameworkwizard.common.OpeningModuleType;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
+import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
 import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
-import org.tianocore.frameworkwizard.module.Identification.Hobs.HobsIdentification;\r
-import org.tianocore.frameworkwizard.module.Identification.Hobs.HobsVector;\r
+import org.tianocore.frameworkwizard.module.Identifications.Hobs.HobsIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.Hobs.HobsVector;\r
+import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 \r
 /**\r
  The class is used to create, update Hob of MSA/MBD file\r
@@ -65,7 +66,7 @@ public class ModuleHobs extends IInternalFrame {
 \r
     private JLabel jLabel = null;\r
 \r
-    private JTextField jTextFieldC_Name = null;\r
+    private JComboBox jComboBoxGuidC_Name = null;\r
 \r
     private JLabel jLabelUsage = null;\r
 \r
@@ -121,6 +122,8 @@ public class ModuleHobs extends IInternalFrame {
     private HobsVector vid = new HobsVector();\r
 \r
     private EnumerationData ed = new EnumerationData();\r
+    \r
+    private WorkspaceTools wt = new WorkspaceTools();\r
 \r
     /**\r
      This method initializes jTextField \r
@@ -128,13 +131,14 @@ public class ModuleHobs extends IInternalFrame {
      @return javax.swing.JTextField jTextFieldC_Name\r
      \r
      **/\r
-    private JTextField getJTextFieldC_Name() {\r
-        if (jTextFieldC_Name == null) {\r
-            jTextFieldC_Name = new JTextField();\r
-            jTextFieldC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jTextFieldC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+    private JComboBox getJComboBoxGuidC_Name() {\r
+        if (jComboBoxGuidC_Name == null) {\r
+            jComboBoxGuidC_Name = new JComboBox();\r
+            jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
+            jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));\r
+            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");\r
         }\r
-        return jTextFieldC_Name;\r
+        return jComboBoxGuidC_Name;\r
     }\r
 \r
     /**\r
@@ -423,7 +427,7 @@ public class ModuleHobs extends IInternalFrame {
      **/\r
     public void setViewMode(boolean isView) {\r
         if (isView) {\r
-            this.jTextFieldC_Name.setEnabled(!isView);\r
+            this.jComboBoxGuidC_Name.setEnabled(!isView);\r
             this.jComboBoxUsage.setEnabled(!isView);\r
             this.jComboBoxHobType.setEnabled(!isView);\r
         }\r
@@ -461,7 +465,7 @@ public class ModuleHobs extends IInternalFrame {
             jContentPane.setPreferredSize(new java.awt.Dimension(490, 495));\r
 \r
             jContentPane.add(jLabel, null);\r
-            jContentPane.add(getJTextFieldC_Name(), null);\r
+            jContentPane.add(getJComboBoxGuidC_Name(), null);\r
             jContentPane.add(jLabelUsage, null);\r
             jContentPane.add(jLabelHobType, null);\r
             jContentPane.add(getJComboBoxUsage(), null);\r
@@ -493,6 +497,7 @@ public class ModuleHobs extends IInternalFrame {
     private void initFrame() {\r
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVHobUsage());\r
         Tools.generateComboBoxByVector(jComboBoxHobType, ed.getVHobType());\r
+        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());\r
 \r
         this.iCheckBoxListArch.setAllItems(ed.getVSupportedArchitectures());\r
     }\r
@@ -536,13 +541,13 @@ public class ModuleHobs extends IInternalFrame {
         //\r
         // Check Name \r
         //\r
-        if (isEmpty(this.jTextFieldC_Name.getText())) {\r
+        if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
             Log.err("Hob Name couldn't be empty");\r
             return false;\r
         }\r
         \r
-        if (!isEmpty(this.jTextFieldC_Name.getText())) {\r
-            if (!DataValidation.isC_NameType(this.jTextFieldC_Name.getText())) {\r
+        if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
+            if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {\r
                 Log.err("Incorrect data type for Hob Name");\r
                 return false;\r
             }\r
@@ -614,7 +619,7 @@ public class ModuleHobs extends IInternalFrame {
         int intPreferredWidth = this.getJContentPane().getPreferredSize().width;\r
         int intPreferredHeight = this.getJContentPane().getPreferredSize().height;\r
 \r
-        resizeComponentWidth(jTextFieldC_Name, intCurrentWidth, intPreferredWidth);\r
+        resizeComponentWidth(jComboBoxGuidC_Name, intCurrentWidth, intPreferredWidth);\r
         resizeComponentWidth(jComboBoxHobType, intCurrentWidth, intPreferredWidth);\r
         resizeComponentWidth(jComboBoxUsage, intCurrentWidth, intPreferredWidth);\r
         resizeComponentWidth(jTextFieldHelpText, intCurrentWidth, intPreferredWidth);\r
@@ -630,7 +635,7 @@ public class ModuleHobs extends IInternalFrame {
     }\r
     \r
     private HobsIdentification getCurrentHobs() {\r
-        String arg0 = this.jTextFieldC_Name.getText();\r
+        String arg0 = this.jComboBoxGuidC_Name.getSelectedItem().toString();\r
         String arg1 = this.jComboBoxHobType.getSelectedItem().toString();\r
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();\r
 \r
@@ -754,7 +759,7 @@ public class ModuleHobs extends IInternalFrame {
            //\r
            intSelectedItemId = jComboBoxList.getSelectedIndex();\r
 \r
-           this.jTextFieldC_Name.setText(vid.getHobs(intSelectedItemId).getName());\r
+           this.jComboBoxGuidC_Name.setSelectedItem(vid.getHobs(intSelectedItemId).getName());\r
            this.jComboBoxHobType.setSelectedItem(vid.getHobs(intSelectedItemId).getType());\r
            this.jComboBoxUsage.setSelectedItem(vid.getHobs(intSelectedItemId).getUsage());\r
            this.jTextFieldHelpText.setText(vid.getHobs(intSelectedItemId).getHelp());\r