import org.tianocore.frameworkwizard.common.ui.IDialog;\r
import org.tianocore.frameworkwizard.common.ui.IFrame;\r
import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
+import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
import org.tianocore.frameworkwizard.module.Identifications.Protocols.ProtocolsIdentification;\r
+import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
\r
/**\r
private JTextField getJTextFieldFeatureFlag() {\r
if (jTextFieldFeatureFlag == null) {\r
jTextFieldFeatureFlag = new JTextField();\r
- jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 132, 320, 20));\r
+ jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");\r
+ jTextFieldFeatureFlag.setEnabled(false);\r
}\r
return jTextFieldFeatureFlag;\r
}\r
* @param inProtocolsId\r
* \r
*/\r
- private void init(ProtocolsIdentification inProtocolsId) {\r
+ private void init(ProtocolsIdentification inProtocolsId, ModuleIdentification mid) {\r
init();\r
this.id = inProtocolsId;\r
+ \r
+ //\r
+ // Init arch with module's arch\r
+ //\r
+ this.jArchCheckBox.setEnabledItems(wt.getModuleArch(mid));\r
+ \r
+ //\r
+ // Get defined protocols from dependent packages\r
+ //\r
+ Vector<PackageIdentification> vpid = wt.getPackageDependenciesOfModule(mid);\r
+ if (vpid.size() <= 0) {\r
+ Log.wrn("Init Protocol", "This module hasn't defined any package dependency, so there is no protocol can be added");\r
+ }\r
+\r
+ Tools.generateComboBoxByVector(this.jComboBoxCName,\r
+ wt.getAllProtocolDeclarationsFromPackages(wt.getPackageDependenciesOfModule(mid)));\r
\r
if (this.id != null) {\r
this.jComboBoxCName.setSelectedItem(id.getName());\r
* @param iFrame\r
* \r
*/\r
- public ProtocolsDlg(ProtocolsIdentification inProtocolsIdentification, IFrame iFrame) {\r
+ public ProtocolsDlg(ProtocolsIdentification inProtocolsIdentification, IFrame iFrame, ModuleIdentification mid) {\r
super(iFrame, true);\r
- init(inProtocolsIdentification);\r
+ init(inProtocolsIdentification, mid);\r
}\r
\r
/**\r
\r
jLabelFeatureFlag = new JLabel();\r
jLabelFeatureFlag.setText("Feature Flag Expression");\r
- jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
+ jLabelFeatureFlag.setBounds(new java.awt.Rectangle(12, 157, 155, 20));\r
+ jLabelFeatureFlag.setEnabled(false);\r
\r
jLabelArch = new JLabel();\r
- jLabelArch.setBounds(new java.awt.Rectangle(12, 157, 155, 20));\r
+ jLabelArch.setBounds(new java.awt.Rectangle(12, 132, 155, 20));\r
jLabelArch.setText("Supported Architectures");\r
jArchCheckBox = new ArchCheckBox();\r
- jArchCheckBox.setBounds(new java.awt.Rectangle(168, 157, 320, 20));\r
+ jArchCheckBox.setBounds(new java.awt.Rectangle(168, 132, 320, 20));\r
jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
\r
jContentPane = new JPanel();\r
*/\r
private void initFrame() {\r
Tools.generateComboBoxByVector(jComboBoxProtocolType, ed.getVProtocolType());\r
- Tools.generateComboBoxByVector(jComboBoxCName, wt.getAllProtocolDeclarationsFromWorkspace());\r
Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVProtocolUsage());\r
}\r
\r
//\r
// Check Name\r
//\r
+ if (this.jComboBoxCName.getSelectedItem() == null) {\r
+ Log.wrn("Update protocols", "Please select one Protocol/ProtocolNotify Name");\r
+ return false;\r
+ }\r
+\r
if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {\r
if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {\r
Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name");\r