X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fmodule%2Fui%2Fdialog%2FHobsDlg.java;h=3448cb3d8901cd0dc70a2861ed4dcb8cccd74516;hp=a9621a601b2988575225fa72c6664bd39b5112e5;hb=623db5caebe9ecf6ef8f78a46a0495761fe1912b;hpb=ed1665f26835816c3ef05ef5eadd30bff1ec4829
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
index a9621a601b..3448cb3d89 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java
@@ -1,6 +1,6 @@
/** @file
- The file is used to create, update Hob of MSA/MBD file
+ The file is used to create, update Hob section of the MSA file
Copyright (c) 2006, Intel Corporation
All rights reserved. This program and the accompanying materials
@@ -23,6 +23,7 @@ import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JScrollPane;
import javax.swing.JTextField;
+import javax.swing.JTextArea;
import org.tianocore.frameworkwizard.common.DataType;
import org.tianocore.frameworkwizard.common.DataValidation;
@@ -37,23 +38,24 @@ import org.tianocore.frameworkwizard.module.Identifications.Hobs.HobsIdentificat
import org.tianocore.frameworkwizard.workspace.WorkspaceTools;
/**
- The class is used to create, update Hob of MSA/MBD file
- It extends IInternalFrame
-
- **/
+ * The class is used to create, update Hob of the MSA file
+ *
+ * It extends IDialog
+ *
+ */
public class HobsDlg extends IDialog {
- ///
- /// Define class Serial Version UID
- ///
+ // /
+ // / Define class Serial Version UID
+ // /
private static final long serialVersionUID = -553473437579358325L;
//
- //Define class members
+ // Define class members
//
private JPanel jContentPane = null;
- private JLabel jLabel = null;
+ private JLabel jLabelC_Name = null;
private JComboBox jComboBoxGuidC_Name = null;
@@ -67,6 +69,10 @@ public class HobsDlg extends IDialog {
private StarLabel jStarLabel1 = null;
+ private StarLabel jStarLabel2 = null;
+
+ private StarLabel jStarLabel3 = null;
+
private JLabel jLabelArch = null;
private JScrollPane jScrollPane = null;
@@ -77,7 +83,9 @@ public class HobsDlg extends IDialog {
private JLabel jLabelHelpText = null;
- private JTextField jTextFieldHelpText = null;
+ private JTextArea jTextAreaHelpText = null;
+
+ private JScrollPane jScrollPaneHelpText = null;
private ArchCheckBox jArchCheckBox = null;
@@ -95,15 +103,15 @@ public class HobsDlg extends IDialog {
private WorkspaceTools wt = new WorkspaceTools();
/**
- This method initializes jTextField
-
- @return javax.swing.JTextField jTextFieldC_Name
-
- **/
+ * This method initializes jTextField
+ *
+ * @return javax.swing.JTextField jTextFieldC_Name
+ *
+ */
private JComboBox getJComboBoxGuidC_Name() {
if (jComboBoxGuidC_Name == null) {
jComboBoxGuidC_Name = new JComboBox();
- jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
+ jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(168, 12, 320, 20));
jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Hob");
}
@@ -111,39 +119,57 @@ public class HobsDlg extends IDialog {
}
/**
- This method initializes jComboBoxUsage
-
- @return javax.swing.JComboBox jComboBoxUsage
-
- **/
- private JComboBox getJComboBoxUsage() {
- if (jComboBoxUsage == null) {
- jComboBoxUsage = new JComboBox();
- jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
- jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
- }
- return jComboBoxUsage;
- }
-
- /**
- This method initializes jComboBoxHobType
-
- @return javax.swing.JComboBox jComboBoxHobType
-
- **/
+ * This method initializes jComboBoxHobType
+ *
+ * @return javax.swing.JComboBox jComboBoxHobType
+ *
+ */
private JComboBox getJComboBoxHobType() {
if (jComboBoxHobType == null) {
jComboBoxHobType = new JComboBox();
- jComboBoxHobType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
+ jComboBoxHobType.setBounds(new java.awt.Rectangle(168, 37, 320, 20));
jComboBoxHobType.setPreferredSize(new java.awt.Dimension(320, 20));
+ jComboBoxHobType
+ .setToolTipText("
"
+ + "PHIT | EFI_HOB_TYPE_HANDOFF |
"
+ + "MEMORY_ALLOCATION | EFI_HOB_TYPE_MEMORY_ALLOCATION and $BaseName |
"
+ + "RESOURCE_DESCRIPTOR | EFI_HOB_TYPE_RESOURCE_DESCRIPTOR |
"
+ + "GUID_EXTENTION | EFI_HOB_TYPE_GUID_EXTENSION and BaseName of GUID |
"
+ + "FIRMWARE_VOLUME | EFI_HOB_TYPE_FV |
"
+ + "CPU | EFI_HOB_TYPE_CPU |
"
+ + "POOL | EFI_HOB_TYPE_PEI_MEMORY_POOL |
"
+ + "CAPSULE_VOLUME | EFI_HOB_TYPE_CV |
"
+ + "
");
}
return jComboBoxHobType;
}
/**
- This method initializes jScrollPane
-
- @return javax.swing.JScrollPane
+ * This method initializes jComboBoxUsage
+ *
+ * @return javax.swing.JComboBox jComboBoxUsage
+ *
+ */
+ private JComboBox getJComboBoxUsage() {
+ if (jComboBoxUsage == null) {
+ jComboBoxUsage = new JComboBox();
+ jComboBoxUsage.setBounds(new java.awt.Rectangle(168, 62, 320, 20));
+ jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
+ jComboBoxUsage
+ .setToolTipText(""
+ + "ALWAYS_CONSUMED | HOB must be present in the system |
"
+ + "SOMETIMES_CONSUMED | HOB will be used if it's present |
"
+ + "ALWAYS_PRODUCED | HOB is always produced |
"
+ + "SOMETIMES_PRODUCED | HOB will sometimes be produced by the module |
"
+ + "
");
+ }
+ return jComboBoxUsage;
+ }
+
+ /**
+ * This method initializes jScrollPane
+ *
+ * @return javax.swing.JScrollPane
*/
private JScrollPane getJScrollPane() {
if (jScrollPane == null) {
@@ -154,44 +180,63 @@ public class HobsDlg extends IDialog {
}
/**
- * This method initializes jTextFieldFeatureFlag
- *
- * @return javax.swing.JTextField
+ * This method initializes jTextFieldFeatureFlag
+ *
+ * @return javax.swing.JTextField
*/
private JTextField getJTextFieldFeatureFlag() {
if (jTextFieldFeatureFlag == null) {
jTextFieldFeatureFlag = new JTextField();
- jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 110, 320, 20));
+ jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20));
jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
+ jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
+ jTextFieldFeatureFlag.setEnabled(false);
}
return jTextFieldFeatureFlag;
}
/**
- This method initializes jTextFieldHelpText
-
- @return javax.swing.JTextField
-
- **/
- private JTextField getJTextFieldHelpText() {
- if (jTextFieldHelpText == null) {
- jTextFieldHelpText = new JTextField();
- jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
- jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));
+ * This method initializes jTextFieldHelpText
+ *
+ * @return javax.swing.JTextField
+ *
+ */
+ private JTextArea getJTextAreaHelpText() {
+ if (jTextAreaHelpText == null) {
+ jTextAreaHelpText = new JTextArea();
+ jTextAreaHelpText.setLineWrap(true);
+ jTextAreaHelpText.setWrapStyleWord(true);
+ }
+ return jTextAreaHelpText;
+ }
+
+ /**
+ * This method initializes jScrollPaneHelpText
+ *
+ * @return javax.swing.JScrollPane
+ */
+ private JScrollPane getJScrollPaneHelpText() {
+ if (jScrollPaneHelpText == null) {
+ jScrollPaneHelpText = new JScrollPane();
+ jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
+ jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
+ jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
+ jScrollPaneHelpText.setLocation(new java.awt.Point(168, 87));
+ jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());
}
- return jTextFieldHelpText;
+ return jScrollPaneHelpText;
}
/**
- This method initializes jButtonOk
-
- @return javax.swing.JButton
-
- **/
+ * This method initializes jButtonOk
+ *
+ * @return javax.swing.JButton
+ *
+ */
private JButton getJButtonOk() {
if (jButtonOk == null) {
jButtonOk = new JButton();
- jButtonOk.setBounds(new java.awt.Rectangle(290, 165, 90, 20));
+ jButtonOk.setBounds(new java.awt.Rectangle(290, 187, 90, 20));
jButtonOk.setText("Ok");
jButtonOk.addActionListener(this);
}
@@ -199,15 +244,15 @@ public class HobsDlg extends IDialog {
}
/**
- This method initializes jButtonCancel
-
- @return javax.swing.JButton
-
- **/
+ * This method initializes jButtonCancel
+ *
+ * @return javax.swing.JButton
+ *
+ */
private JButton getJButtonCancel() {
if (jButtonCancel == null) {
jButtonCancel = new JButton();
- jButtonCancel.setBounds(new java.awt.Rectangle(390, 165, 90, 20));
+ jButtonCancel.setBounds(new java.awt.Rectangle(390, 187, 90, 20));
jButtonCancel.setText("Cancel");
jButtonCancel.addActionListener(this);
}
@@ -219,11 +264,11 @@ public class HobsDlg extends IDialog {
}
/**
- This method initializes this
-
- **/
+ * This method initializes this
+ *
+ */
private void init() {
- this.setSize(500, 225);
+ this.setSize(505, 260);
this.setContentPane(getJScrollPane());
this.setTitle("Hobs");
initFrame();
@@ -232,12 +277,12 @@ public class HobsDlg extends IDialog {
}
/**
- This method initializes this
- Fill values to all fields if these values are not empty
-
- @param inHobsId
-
- **/
+ * This method initializes this Fill values to all fields if these values are
+ * not empty
+ *
+ * @param inHobsId
+ *
+ */
private void init(HobsIdentification inHobsId) {
init();
this.id = inHobsId;
@@ -246,30 +291,31 @@ public class HobsDlg extends IDialog {
this.jComboBoxGuidC_Name.setSelectedItem(id.getName());
this.jComboBoxHobType.setSelectedItem(id.getType());
this.jComboBoxUsage.setSelectedItem(id.getUsage());
- this.jTextFieldHelpText.setText(id.getHelp());
+ this.jTextAreaHelpText.setText(id.getHelp());
this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());
this.jArchCheckBox.setSelectedItems(id.getSupArchList());
}
}
/**
- This is the override edit constructor
-
- @param inHobsIdentification
- @param iFrame
-
- **/
+ * This is the override edit constructor
+ *
+ * @param inHobsIdentification
+ * @param iFrame
+ *
+ */
public HobsDlg(HobsIdentification inHobsIdentification, IFrame iFrame) {
super(iFrame, true);
init(inHobsIdentification);
}
/**
- Disable all components when the mode is view
-
- @param isView true - The view mode; false - The non-view mode
-
- **/
+ * Disable all components when the mode is view
+ *
+ * @param isView
+ * true - The view mode; false - The non-view mode
+ *
+ */
public void setViewMode(boolean isView) {
if (isView) {
this.jComboBoxGuidC_Name.setEnabled(!isView);
@@ -279,55 +325,65 @@ public class HobsDlg extends IDialog {
}
/**
- This method initializes jContentPane
-
- @return javax.swing.JPanel jContentPane
-
- **/
+ * This method initializes jContentPane
+ *
+ * @return javax.swing.JPanel jContentPane
+ *
+ */
public JPanel getJContentPane() {
if (jContentPane == null) {
- jArchCheckBox = new ArchCheckBox();
- jArchCheckBox.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
- jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));
- jLabelFeatureFlag = new JLabel();
- jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20));
- jLabelFeatureFlag.setText("Feature Flag");
- jLabelArch = new JLabel();
- jLabelArch.setBounds(new java.awt.Rectangle(15, 135, 140, 20));
- jLabelArch.setText("Arch");
+ jStarLabel1 = new StarLabel();
+ jStarLabel1.setLocation(new java.awt.Point(2, 12));
+ jLabelC_Name = new JLabel();
+ jLabelC_Name.setText("Hob's Guid C Name");
+ jLabelC_Name.setBounds(new java.awt.Rectangle(12, 12, 155, 20));
+
+ jStarLabel2 = new StarLabel();
+ jStarLabel2.setLocation(new java.awt.Point(2, 37));
jLabelHobType = new JLabel();
jLabelHobType.setText("Hob Type");
- jLabelHobType.setBounds(new java.awt.Rectangle(15, 35, 140, 20));
+ jLabelHobType.setBounds(new java.awt.Rectangle(12, 37, 155, 20));
+
+ jStarLabel3 = new StarLabel();
+ jStarLabel3.setLocation(new java.awt.Point(2, 62));
jLabelUsage = new JLabel();
jLabelUsage.setText("Usage");
- jLabelUsage.setBounds(new java.awt.Rectangle(15, 60, 140, 20));
- jLabel = new JLabel();
- jLabel.setText("Guid C_Name");
- jLabel.setBounds(new java.awt.Rectangle(15, 10, 140, 20));
+ jLabelUsage.setBounds(new java.awt.Rectangle(12, 62, 155, 20));
+
jLabelHelpText = new JLabel();
- jLabelHelpText.setBounds(new java.awt.Rectangle(14, 85, 140, 20));
+ jLabelHelpText.setBounds(new java.awt.Rectangle(12, 87, 155, 20));
jLabelHelpText.setText("Help Text");
+ jLabelFeatureFlag = new JLabel();
+ jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 155, 20));
+ jLabelFeatureFlag.setText("Feature Flag Expression");
+ jLabelFeatureFlag.setEnabled(false);
+
+ jLabelArch = new JLabel();
+ jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20));
+ jLabelArch.setText("Supported Architectures");
+ jArchCheckBox = new ArchCheckBox();
+ jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20));
+ jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));
+
jContentPane = new JPanel();
jContentPane.setLayout(null);
- jContentPane.setPreferredSize(new java.awt.Dimension(490, 190));
+ jContentPane.setPreferredSize(new java.awt.Dimension(485, 215));
- jContentPane.add(jLabel, null);
+ jContentPane.add(jStarLabel1, null);
+ jContentPane.add(jLabelC_Name, null);
jContentPane.add(getJComboBoxGuidC_Name(), null);
- jContentPane.add(jLabelUsage, null);
+ jContentPane.add(jStarLabel2, null);
jContentPane.add(jLabelHobType, null);
- jContentPane.add(getJComboBoxUsage(), null);
jContentPane.add(getJComboBoxHobType(), null);
- jStarLabel1 = new StarLabel();
- jStarLabel1.setLocation(new java.awt.Point(0, 10));
- jContentPane.add(jStarLabel1, null);
-
- jContentPane.add(jLabelArch, null);
-
+ jContentPane.add(jStarLabel3, null);
+ jContentPane.add(jLabelUsage, null);
+ jContentPane.add(getJComboBoxUsage(), null);
+ jContentPane.add(jLabelHelpText, null);
+ jContentPane.add(getJScrollPaneHelpText(), null);
jContentPane.add(jLabelFeatureFlag, null);
jContentPane.add(getJTextFieldFeatureFlag(), null);
- jContentPane.add(jLabelHelpText, null);
- jContentPane.add(getJTextFieldHelpText(), null);
+ jContentPane.add(jLabelArch, null);
jContentPane.add(jArchCheckBox, null);
jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null);
@@ -336,18 +392,20 @@ public class HobsDlg extends IDialog {
}
/**
- This method initializes Usage type and Hob type
-
- **/
+ * This method initializes Usage type and Hob type
+ *
+ */
private void initFrame() {
Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVHobUsage());
Tools.generateComboBoxByVector(jComboBoxHobType, ed.getVHobType());
Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());
}
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
* @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)
- *
+ *
* Override actionPerformed to listen all actions
*
*/
@@ -367,22 +425,22 @@ public class HobsDlg extends IDialog {
}
/**
- Data validation for all fields
-
- @retval true - All datas are valid
- @retval false - At least one data is invalid
-
- **/
+ * Data validation for all fields
+ *
+ * @retval true - All datas are valid
+ * @retval false - At least one data is invalid
+ *
+ */
public boolean checkAdd() {
//
- // Check if all fields have correct data types
+ // Check if all fields have correct data types
//
//
- // Check Name
+ // Check Name
//
if (isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {
- Log.wrn("Update Hobs", "Hob Name couldn't be empty");
+ Log.wrn("Update Hobs", "Hob Guid C Name must be entered!");
return false;
}
@@ -413,7 +471,7 @@ public class HobsDlg extends IDialog {
String arg3 = this.jTextFieldFeatureFlag.getText();
Vector arg4 = this.jArchCheckBox.getSelectedItemsVector();
- String arg5 = this.jTextFieldHelpText.getText();
+ String arg5 = this.jTextAreaHelpText.getText();
id = new HobsIdentification(arg0, arg1, arg2, arg3, arg4, arg5);
return id;
}