\r
private JPanel jContentPane = null;\r
\r
- private JTextField jTextFieldAdd = null;\r
+ private JTextField jTextFieldGuid = null;\r
\r
private JScrollPane jScrollPane = null;\r
\r
\r
private JScrollPane topScrollPane = null; // @jve:decl-index=0:visual-constraint="10,213"\r
\r
- private JLabel jLabelVer = null;\r
+ private JLabel jLabelCName = null;\r
\r
private GenGuidDialog guidDialog = null;\r
\r
- private JTextField jTextFieldVersion = null;\r
+ private JTextField jTextFieldCName = null;\r
\r
- private JLabel jLabel = null;\r
+ private JLabel jLabelHelp = null;\r
\r
- private JTextField jTextField = null;\r
+ private JTextField jTextFieldHelp = null;\r
\r
- private JLabel jLabel1 = null;\r
+ private JLabel jLabelSupMod = null;\r
\r
- private JLabel jLabel2 = null;\r
+ private JLabel jLabelSupArch = null;\r
\r
- private ICheckBoxList iCheckBoxList = null;\r
+ private ICheckBoxList iCheckBoxListArch = null;\r
\r
- private ICheckBoxList iCheckBoxList1 = null;\r
+ private ICheckBoxList iCheckBoxListGuid = null;\r
\r
- private ICheckBoxList iCheckBoxList2 = null;\r
-\r
- private JLabel jLabel3 = null;\r
+ private ICheckBoxList iCheckBoxListMod = null;\r
\r
+ private JLabel jLabelGuidType = null;\r
\r
+ protected String[][] saa = null;\r
\r
/**\r
This method initializes this\r
}\r
\r
/**\r
- This method initializes jTextFieldAdd \r
+ This method initializes jTextFieldGuid \r
\r
@return javax.swing.JTextField \r
**/\r
- protected JTextField getJTextFieldAdd() {\r
- if (jTextFieldAdd == null) {\r
- jTextFieldAdd = new JTextField();\r
- jTextFieldAdd.setBounds(new java.awt.Rectangle(137,35,337,20));\r
- jTextFieldAdd.setPreferredSize(new java.awt.Dimension(335,20));\r
+ protected JTextField getJTextFieldGuid() {\r
+ if (jTextFieldGuid == null) {\r
+ jTextFieldGuid = new JTextField();\r
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(137,60,435,20));\r
+ jTextFieldGuid.setPreferredSize(new java.awt.Dimension(200,20));\r
\r
}\r
- return jTextFieldAdd;\r
+ return jTextFieldGuid;\r
}\r
\r
/**\r
jTable.setRowHeight(20);\r
jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
model.addColumn("Name");\r
- model.addColumn("C_Name");\r
+ model.addColumn("The C Name");\r
model.addColumn("GUID Value");\r
- model.addColumn("HelpText");\r
- model.addColumn("SupportedArch");\r
- model.addColumn("SupportedModuleType");\r
+ model.addColumn("Help Text");\r
+ model.addColumn("Supported Architectures");\r
+ model.addColumn("Supported Module Types");\r
model.addColumn("GuidTypes");\r
jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());\r
\r
}\r
else{\r
selectedRow = lsm.getMinSelectionIndex();\r
+ \r
}\r
}\r
});\r
public void tableChanged(TableModelEvent arg0) {\r
// TODO Auto-generated method stub\r
int row = arg0.getFirstRow();\r
+ int column = arg0.getColumn();\r
TableModel m = (TableModel)arg0.getSource();\r
if (arg0.getType() == TableModelEvent.UPDATE){\r
- if (docConsole != null) {\r
- docConsole.setSaved(false);\r
- }\r
- updateRow(row, m);\r
+ \r
+ updateRow(row, column, m);\r
}\r
}\r
\r
- protected void updateRow(int row, TableModel m){\r
+ protected void updateRow(int row, int column, TableModel m){\r
+ String[] sa = new String[7];\r
+ sfc.getSpdGuidDeclaration(sa, row);\r
+ Object cellData = m.getValueAt(row, column);\r
+ if (cellData == null) {\r
+ cellData = "";\r
+ }\r
+ if (cellData.equals(sa[column])) {\r
+ return;\r
+ }\r
+ if (cellData.toString().length() == 0 && sa[column] == null) {\r
+ return;\r
+ }\r
+ \r
String name = m.getValueAt(row, 0) + "";\r
String cName = m.getValueAt(row, 1) + "";\r
String guid = m.getValueAt(row, 2) + "";\r
if (!dataValidation(rowData)){\r
return;\r
}\r
- \r
+ if (docConsole != null) {\r
+ docConsole.setSaved(false);\r
+ }\r
sfc.updateSpdGuidDecl(row, name, cName, guid, help, archList, modTypeList, guidTypeList);\r
}\r
/**\r
//\r
// initialize table using SpdFileContents object\r
//\r
- String[][] saa = new String[sfc.getSpdGuidDeclarationCount()][7];\r
+ saa = new String[sfc.getSpdGuidDeclarationCount()][7];\r
sfc.getSpdGuidDeclarations(saa);\r
int i = 0;\r
while (i < saa.length) {\r
**/\r
protected JPanel getJContentPane1() {\r
if (jContentPane == null) {\r
- jLabel3 = new JLabel();\r
- jLabel3.setBounds(new java.awt.Rectangle(400,122,103,16));\r
- jLabel3.setText("GUID Type List");\r
- jLabel3.setEnabled(true);\r
- jLabel2 = new JLabel();\r
- jLabel2.setBounds(new java.awt.Rectangle(197,122,108,16));\r
- jLabel2.setText("Supported Arch");\r
- jLabel2.setEnabled(true);\r
- jLabel1 = new JLabel();\r
- jLabel1.setBounds(new java.awt.Rectangle(14,120,110,16));\r
- jLabel1.setText("Supported Module");\r
- jLabel1.setEnabled(true);\r
- jLabel = new JLabel();\r
- jLabel.setText("HelpText");\r
- jLabel.setSize(new java.awt.Dimension(109,20));\r
- jLabel.setLocation(new java.awt.Point(14,85));\r
- jLabelVer = new JLabel();\r
- jLabelVer.setBounds(new java.awt.Rectangle(14,60,111,20));\r
- jLabelVer.setText("C_Name");\r
+ jLabelGuidType = new JLabel();\r
+ jLabelGuidType.setBounds(new java.awt.Rectangle(400,122,103,16));\r
+ jLabelGuidType.setText("GUID Type List");\r
+ jLabelGuidType.setEnabled(true);\r
+ jLabelSupArch = new JLabel();\r
+ jLabelSupArch.setBounds(new java.awt.Rectangle(197,122,108,16));\r
+ jLabelSupArch.setText("Supported Arch");\r
+ jLabelSupArch.setEnabled(true);\r
+ jLabelSupMod = new JLabel();\r
+ jLabelSupMod.setBounds(new java.awt.Rectangle(14,120,110,16));\r
+ jLabelSupMod.setText("Supported Module");\r
+ jLabelSupMod.setEnabled(true);\r
+ jLabelHelp = new JLabel();\r
+ jLabelHelp.setText("HelpText");\r
+ jLabelHelp.setSize(new java.awt.Dimension(109,20));\r
+ jLabelHelp.setLocation(new java.awt.Point(14,85));\r
+ jLabelCName = new JLabel();\r
+ jLabelCName.setBounds(new java.awt.Rectangle(14,35,111,20));\r
+ jLabelCName.setText("C Name");\r
jLabelGuid = new JLabel();\r
- jLabelGuid.setBounds(new java.awt.Rectangle(15,35,112,20));\r
+ jLabelGuid.setBounds(new java.awt.Rectangle(15,60,112,20));\r
jLabelGuid.setText("Guid Value");\r
jLabelName = new JLabel();\r
jLabelName.setBounds(new java.awt.Rectangle(15,10,113,20));\r
jContentPane.add(jStarLabel2, null);\r
jContentPane.add(jStarLabel3, null);\r
jContentPane.add(jStarLabel4, null);\r
- jContentPane.add(jLabelVer, null);\r
- jContentPane.add(getJTextFieldVersion(), null);\r
- jContentPane.add(getJTextFieldAdd(), null);\r
+ jContentPane.add(jLabelCName, null);\r
+ jContentPane.add(getJTextFieldCName(), null);\r
+ jContentPane.add(getJTextFieldGuid(), null);\r
jContentPane.add(getJScrollPane(), null);\r
jContentPane.add(getJButtonAdd(), null);\r
jContentPane.add(getJButtonRemove(), null);\r
jContentPane.add(jLabelName, null);\r
jContentPane.add(getJTextFieldName(), null);\r
jContentPane.add(jLabelGuid, null);\r
- jContentPane.add(jLabel, null);\r
- jContentPane.add(getJTextField(), null);\r
- jContentPane.add(jLabel1, null);\r
- jContentPane.add(jLabel2, null);\r
+ jContentPane.add(jLabelHelp, null);\r
+ jContentPane.add(getJTextFieldHelp(), null);\r
+ jContentPane.add(jLabelSupMod, null);\r
+ jContentPane.add(jLabelSupArch, null);\r
jContentPane.add(getJScrollPaneArch(), null);\r
jContentPane.add(getJScrollPaneGuid(), null);\r
jContentPane.add(getJScrollPaneModule(), null);\r
- jContentPane.add(jLabel3, null);\r
+ jContentPane.add(jLabelGuidType, null);\r
}\r
return jContentPane;\r
}\r
\r
//ToDo: check before add\r
String[] row = {"", "", "", "", "", "", ""};\r
- row[3] = jTextField.getText();\r
- row[2] = jTextFieldAdd.getText();\r
- row[1] = jTextFieldVersion.getText();\r
+ row[3] = jTextFieldHelp.getText();\r
+ row[2] = jTextFieldGuid.getText();\r
+ row[1] = jTextFieldCName.getText();\r
row[0] = jTextFieldName.getText();\r
- row[4] = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
+ row[4] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
if (row[4].length() == 0) {\r
row[4] = null;\r
}\r
- row[5] = vectorToString(iCheckBoxList2.getAllCheckedItemsString());\r
+ row[5] = vectorToString(iCheckBoxListMod.getAllCheckedItemsString());\r
if (row[5].length() == 0) {\r
row[5] = null;\r
}\r
- row[6] = vectorToString(iCheckBoxList1.getAllCheckedItemsString());\r
+ row[6] = vectorToString(iCheckBoxListGuid.getAllCheckedItemsString());\r
if (row[6].length() == 0) {\r
row[6] = null;\r
}\r
if (!dataValidation(row)) {\r
return;\r
}\r
- if (docConsole != null) {\r
- docConsole.setSaved(false);\r
+ \r
+ if (addRow(row) == -1) {\r
+ return;\r
}\r
model.addRow(row);\r
jTable.changeSelection(model.getRowCount()-1, 0, false, false);\r
- addRow(row);\r
+ \r
}\r
//\r
// remove selected line\r
}\r
\r
if (arg0.getSource() == jButtonGen) {\r
- jTextFieldAdd.setText(Tools.generateUuidString());\r
+ jTextFieldGuid.setText(Tools.generateUuidString());\r
}\r
\r
if (arg0.getActionCommand().equals("GenGuidValue")) {\r
- jTextFieldAdd.setText(guidDialog.getGuid());\r
+ jTextFieldGuid.setText(guidDialog.getGuid());\r
}\r
\r
}\r
\r
protected boolean dataValidation(String[] row){\r
if (!DataValidation.isUiNameType(row[0])) {\r
- JOptionPane.showMessageDialog(this, "Name is NOT UiNameType.");\r
+ JOptionPane.showMessageDialog(this, "Name must start with an alpha character.");\r
return false;\r
}\r
if (!DataValidation.isGuid(row[2])) {\r
- JOptionPane.showMessageDialog(this, "Guid Value is NOT GuidType.");\r
+ JOptionPane.showMessageDialog(this, "Guid Value must be in registry format, 8-4-4-4-12.");\r
return false;\r
}\r
if (!DataValidation.isC_NameType(row[1])) {\r
- JOptionPane.showMessageDialog(this, "C_Name is NOT C_NameType.");\r
+ JOptionPane.showMessageDialog(this, "C Name does not match C Name datatype.");\r
return false;\r
}\r
if (row[3].length() == 0) {\r
- JOptionPane.showMessageDialog(this, "HelpText could NOT be empty.");\r
+ JOptionPane.showMessageDialog(this, "Help Text must be entered!");\r
return false;\r
}\r
return true;\r
}\r
\r
- protected void addRow(String[] row) {\r
- Vector<String> vArch = iCheckBoxList.getAllCheckedItemsString();\r
- Vector<String> vModType = iCheckBoxList2.getAllCheckedItemsString();\r
- Vector<String> vguidType = iCheckBoxList1.getAllCheckedItemsString();\r
+ protected int addRow(String[] row) {\r
+ Vector<String> vArch = iCheckBoxListArch.getAllCheckedItemsString();\r
+ if (vArch.size() == 0) {\r
+ vArch = null;\r
+ }\r
+ Vector<String> vModType = iCheckBoxListMod.getAllCheckedItemsString();\r
+ if (vModType.size() == 0) {\r
+ vModType = null;\r
+ }\r
+ Vector<String> vguidType = iCheckBoxListGuid.getAllCheckedItemsString();\r
+ if (vguidType.size() == 0) {\r
+ vguidType = null;\r
+ }\r
+ if (vguidType == null) {\r
+ JOptionPane.showMessageDialog(this, "You must select one GUID type.");\r
+ return -1;\r
+ }\r
+ if (docConsole != null) {\r
+ docConsole.setSaved(false);\r
+ }\r
sfc.genSpdGuidDeclarations(row[0], row[1], row[2], row[3], vArch, vModType, vguidType);\r
+ return 0;\r
}\r
\r
protected void removeRow(int i){\r
sfc.removeSpdGuidDeclaration(i);\r
+ if (docConsole != null) {\r
+ docConsole.setSaved(false);\r
+ }\r
}\r
\r
protected void clearAllRow(){\r
sfc.removeSpdGuidDeclaration();\r
+ if (docConsole != null) {\r
+ docConsole.setSaved(false);\r
+ }\r
}\r
\r
/**\r
}\r
\r
/**\r
- * This method initializes jTextFieldVersion \r
+ * This method initializes jTextFieldCName \r
* \r
* @return javax.swing.JTextField \r
*/\r
- protected JTextField getJTextFieldVersion() {\r
- if (jTextFieldVersion == null) {\r
- jTextFieldVersion = new JTextField();\r
- jTextFieldVersion.setBounds(new java.awt.Rectangle(137,60,225,20));\r
- jTextFieldVersion.setPreferredSize(new java.awt.Dimension(225,20));\r
+ protected JTextField getJTextFieldCName() {\r
+ if (jTextFieldCName == null) {\r
+ jTextFieldCName = new JTextField();\r
+ jTextFieldCName.setBounds(new java.awt.Rectangle(137,35,337,20));\r
+ jTextFieldCName.setPreferredSize(new java.awt.Dimension(335,20));\r
}\r
- return jTextFieldVersion;\r
+ return jTextFieldCName;\r
}\r
\r
public void componentResized(ComponentEvent arg0) {\r
int intPreferredWidth = 500;\r
\r
- resizeComponentWidth(this.jTextFieldName, this.getWidth(), intPreferredWidth);\r
- resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth);\r
- resizeComponentWidth(this.jTextFieldVersion, this.getWidth(), intPreferredWidth);\r
- resizeComponentWidth(this.jTextField, this.getWidth(), intPreferredWidth);\r
- resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);\r
- relocateComponentX(this.jButtonGen, this.getWidth(), this.getPreferredSize().width, 40);\r
+ Tools.resizeComponentWidth(this.jTextFieldName, this.getWidth(), intPreferredWidth);\r
+\r
+ Tools.resizeComponentWidth(this.jTextFieldCName, this.getWidth(), intPreferredWidth);\r
+ Tools.resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
+ Tools.resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);\r
+ Tools.relocateComponentX(this.jButtonGen, this.getWidth(), this.getPreferredSize().width, 40);\r
\r
}\r
\r
* \r
* @return javax.swing.JTextField \r
*/\r
- private JTextField getJTextField() {\r
- if (jTextField == null) {\r
- jTextField = new JTextField();\r
- jTextField.setBounds(new java.awt.Rectangle(136,85,337,20));\r
- jTextField.setPreferredSize(new Dimension(335, 20));\r
+ private JTextField getJTextFieldHelp() {\r
+ if (jTextFieldHelp == null) {\r
+ jTextFieldHelp = new JTextField();\r
+ jTextFieldHelp.setBounds(new java.awt.Rectangle(136,85,337,20));\r
+ jTextFieldHelp.setPreferredSize(new Dimension(335, 20));\r
}\r
- return jTextField;\r
+ return jTextFieldHelp;\r
}\r
\r
private JScrollPane getJScrollPaneArch() {\r
jScrollPaneArch = new JScrollPane();\r
jScrollPaneArch.setBounds(new java.awt.Rectangle(197,142,188,74));\r
jScrollPaneArch.setPreferredSize(new java.awt.Dimension(188, 74));\r
- jScrollPaneArch.setViewportView(getICheckBoxList());\r
+ jScrollPaneArch.setViewportView(getICheckBoxListArch());\r
}\r
return jScrollPaneArch;\r
}\r
* \r
* @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList \r
*/\r
- private ICheckBoxList getICheckBoxList() {\r
- if (iCheckBoxList == null) {\r
- iCheckBoxList = new ICheckBoxList();\r
- iCheckBoxList.setBounds(new java.awt.Rectangle(197,142,188,74));\r
+ private ICheckBoxList getICheckBoxListArch() {\r
+ if (iCheckBoxListArch == null) {\r
+ iCheckBoxListArch = new ICheckBoxList();\r
+ iCheckBoxListArch.setBounds(new java.awt.Rectangle(197,142,188,74));\r
Vector<String> v = new Vector<String>();\r
v.add("IA32");\r
v.add("X64");\r
v.add("EBC");\r
v.add("ARM");\r
v.add("PPC");\r
- iCheckBoxList.setAllItems(v);\r
+ iCheckBoxListArch.setAllItems(v);\r
}\r
- return iCheckBoxList;\r
+ return iCheckBoxListArch;\r
}\r
\r
protected JScrollPane getJScrollPaneGuid() {\r
jScrollPaneGuid.setPreferredSize(new java.awt.Dimension(190,74));\r
jScrollPaneGuid.setLocation(new java.awt.Point(400,142));\r
jScrollPaneGuid.setSize(new java.awt.Dimension(260,74));\r
- jScrollPaneGuid.setViewportView(getICheckBoxList1());\r
+ jScrollPaneGuid.setViewportView(getICheckBoxListGuid());\r
}\r
return jScrollPaneGuid;\r
}\r
* \r
* @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList \r
*/\r
- private ICheckBoxList getICheckBoxList1() {\r
- if (iCheckBoxList1 == null) {\r
- iCheckBoxList1 = new ICheckBoxList();\r
- iCheckBoxList1.setBounds(new java.awt.Rectangle(400,142,177,74));\r
+ private ICheckBoxList getICheckBoxListGuid() {\r
+ if (iCheckBoxListGuid == null) {\r
+ iCheckBoxListGuid = new ICheckBoxList();\r
+ iCheckBoxListGuid.setBounds(new java.awt.Rectangle(400,142,177,74));\r
Vector<String> v = new Vector<String>();\r
v.add("DATA_HUB_RECORD");\r
v.add("EFI_EVENT");\r
v.add("HOB");\r
v.add("TOKEN_SPACE_GUID");\r
\r
- iCheckBoxList1.setAllItems(v);\r
+ iCheckBoxListGuid.setAllItems(v);\r
}\r
- return iCheckBoxList1;\r
+ return iCheckBoxListGuid;\r
}\r
\r
private JScrollPane getJScrollPaneModule() {\r
jScrollPaneModule = new JScrollPane();\r
jScrollPaneModule.setBounds(new java.awt.Rectangle(14,142,170,74));\r
jScrollPaneModule.setPreferredSize(new java.awt.Dimension(170, 74));\r
- jScrollPaneModule.setViewportView(getICheckBoxList2());\r
+ jScrollPaneModule.setViewportView(getICheckBoxListMod());\r
}\r
return jScrollPaneModule;\r
}\r
* \r
* @return org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList \r
*/\r
- private ICheckBoxList getICheckBoxList2() {\r
- if (iCheckBoxList2 == null) {\r
- iCheckBoxList2 = new ICheckBoxList();\r
- iCheckBoxList2.setBounds(new java.awt.Rectangle(14,142,170,74));\r
+ private ICheckBoxList getICheckBoxListMod() {\r
+ if (iCheckBoxListMod == null) {\r
+ iCheckBoxListMod = new ICheckBoxList();\r
+ iCheckBoxListMod.setBounds(new java.awt.Rectangle(14,142,170,74));\r
Vector<String> v = new Vector<String>();\r
v.add("BASE");\r
v.add("SEC");\r
v.add("UEFI_DRIVER");\r
v.add("UEFI_APPLICATION");\r
v.add("USER_DEFINED");\r
- iCheckBoxList2.setAllItems(v);\r
+ iCheckBoxListMod.setAllItems(v);\r
}\r
- return iCheckBoxList2;\r
+ return iCheckBoxListMod;\r
}\r
\r
public static void main(String[] args){\r
return v;\r
}\r
\r
- protected JLabel getJLabel3() {\r
- return jLabel3;\r
+ protected JLabel getJLabelGuidType() {\r
+ return jLabelGuidType;\r
}\r
}\r
\r
projects / mirror_edk2.git / blobdiff