if (jScrollPane == null) {\r
jScrollPane = new JScrollPane();\r
jScrollPane.setBounds(new java.awt.Rectangle(12,351,608,253));\r
- jScrollPane.setPreferredSize(new java.awt.Dimension(390,150));\r
+ jScrollPane.setPreferredSize(new java.awt.Dimension(500,419));\r
jScrollPane.setViewportView(getJTable());\r
}\r
return jScrollPane;\r
model = new DefaultTableModel();\r
jTable = new JTable(model);\r
jTable.setRowHeight(20);\r
-// jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+ jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
jTable.setColumnSelectionAllowed(false);\r
model.addColumn("Class Name");\r
model.addColumn("Header");\r
model.addColumn("Help Text");\r
- model.addColumn("Reserved");\r
- model.addColumn("Reserved");\r
-// model.addColumn("Recommended Instance");\r
-// model.addColumn("Version");\r
+ model.addColumn("Recommended Instance");\r
+ model.addColumn("Version");\r
model.addColumn("Sup. Arch");\r
model.addColumn("Mod. Types");\r
\r
vArch.add("EBC");\r
vArch.add("ARM");\r
vArch.add("PPC");\r
-// jTable.getColumnModel().getColumn(cnSupArch).setCellEditor(new ListEditor(vArch));\r
+ jTable.getColumnModel().getColumn(cnSupArch).setCellEditor(new ListEditor(vArch));\r
\r
Vector<String> vModule = new Vector<String>();\r
vModule.add("BASE");\r
vModule.add("UEFI_DRIVER");\r
vModule.add("UEFI_APPLICATION");\r
vModule.add("USER_DEFINED");\r
- vModule.add("NONE");\r
\r
jTable.getColumnModel().getColumn(cnSupMod).setCellEditor(new ListEditor(vModule));\r
\r
arch = m.getValueAt(row, cnSupArch).toString();\r
}\r
String module = null;\r
- // if (lsm.isSelectionEmpty()) {\r
if (m.getValueAt(row, cnSupMod) != null) {\r
module = m.getValueAt(row, cnSupMod).toString();\r
- if (module == "NONE") {\r
- module = null;\r
- }\r
}\r
- String[] rowData = {lib, hdr, hlp};\r
+ String[] rowData = {lib, hdr, hlp, name, ver};\r
if (!dataValidation(rowData)) {\r
return;\r
}\r
docConsole.setSaved(false);\r
\r
-// LAH getLibInstances(lib);\r
-\r
-// LAH String guid = nameToGuid(name);\r
+ getLibInstances(lib);\r
+ String guid = nameToGuid(name);\r
\r
- // LAH WAS sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
- sfc.updateSpdLibClass(row, lib, hdr, hlp, null, null, arch, module);\r
+ sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
}\r
}\r
\r
jButtonAdd = new JButton();\r
jButtonAdd.setText("Add");\r
jButtonAdd.setSize(new java.awt.Dimension(99,20));\r
- jButtonAdd.setLocation(new java.awt.Point(321,326));\r
+ jButtonAdd.setBounds(new java.awt.Rectangle(321,326,99,20));\r
jButtonAdd.addActionListener(this);\r
}\r
return jButtonAdd;\r
jButtonRemove = new JButton();\r
jButtonRemove.setText("Remove");\r
jButtonRemove.setSize(new java.awt.Dimension(99,20));\r
- jButtonRemove.setLocation(new java.awt.Point(424,326));\r
+ jButtonRemove.setBounds(new java.awt.Rectangle(424,326,99,20));\r
jButtonRemove.addActionListener(this);\r
}\r
return jButtonRemove;\r
jButtonRemoveAll = new JButton();\r
jButtonRemoveAll.setText("Remove All");\r
jButtonRemoveAll.setSize(new java.awt.Dimension(99,20));\r
- jButtonRemoveAll.setLocation(new java.awt.Point(527,326));\r
+ jButtonRemoveAll.setBounds(new java.awt.Rectangle(527,326,99,20));\r
jButtonRemoveAll.addActionListener(this);\r
}\r
return jButtonRemoveAll;\r
private JScrollPane getJContentPane(){\r
if (topScrollPane == null){\r
topScrollPane = new JScrollPane();\r
- topScrollPane.setSize(new java.awt.Dimension(634,590));\r
+// topScrollPane.setSize(new java.awt.Dimension(634,590));\r
topScrollPane.setViewportView(getJContentPane1());\r
}\r
return topScrollPane;\r
jLabel3RecInstName.setText("Recommended Instance Name");\r
\r
jContentPane = new JPanel();\r
- jContentPane.setPreferredSize(new Dimension(480, 400));\r
+ jContentPane.setPreferredSize(new Dimension(680, 600));\r
jContentPane.setLayout(null);\r
jContentPane.add(jLabelHdr, null);\r
jContentPane.add(jStarLabel1, null);\r
jContentPane.add(starLabel, null);\r
jContentPane.add(jLabel2HelpText, null);\r
jContentPane.add(getJTextFieldHelp(), null);\r
-// LAH Removed until we can fix permanently\r
-// jContentPane.add(jLabel3RecInstName, null);\r
-// jContentPane.add(getJTextField1RecInstName(), null);\r
-// jContentPane.add(jLabel4RecInstVer, null);\r
-// jContentPane.add(getJTextField2RecInstVer(), null);\r
+\r
+ jContentPane.add(jLabel3RecInstName, null);\r
+ jContentPane.add(getJTextField1RecInstName(), null);\r
+ jContentPane.add(jLabel4RecInstVer, null);\r
+ jContentPane.add(getJTextField2RecInstVer(), null);\r
jContentPane.add(jLabel5SupArchList, null);\r
jContentPane.add(jLabel6SupModList, null);\r
\r
jContentPane.add(getJScrollPaneModules(), null);\r
jContentPane.add(getJScrollPane1Arch(), null);\r
-// LAH jContentPane.add(getJComboBox(), null);\r
+ jContentPane.add(getJComboBox(), null);\r
\r
}\r
\r
row[cnClassName] = jTextFieldAdd.getText();\r
row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/');\r
row[cnHelpText] = jTextFieldHelp.getText();\r
+ row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
+ row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
row[cnSupArch] = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
if (row[cnSupArch].length() == 0) {\r
row[cnSupArch] = null;\r
//\r
//convert to GUID before storing recommended lib instance.\r
//\r
- getLibInstances(row[0]);\r
+ getLibInstances(row[cnClassName]);\r
+ String recommendGuid = nameToGuid(row[cnRecInstName]);\r
\r
-// LAH recommendGuid = nameToGuid(row[3]);\r
-\r
-// LAH WAS sfc.genSpdLibClassDeclarations(row[0], recommendGuid, row[1], row[2], row[5], null, null, row[4], null, row[6]);\r
- sfc.genSpdLibClassDeclarations(row[cnClassName], null, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, row[cnRecInstVer], null, row[cnSupMod]);\r
+ sfc.genSpdLibClassDeclarations(row[cnClassName], recommendGuid, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, row[cnRecInstVer], null, row[cnSupMod]);\r
\r
}\r
//\r
int rowSelected = selectedRow;\r
if (rowSelected >= 0) {\r
model.removeRow(rowSelected);\r
+ docConsole.setSaved(false);\r
sfc.removeSpdLibClass(rowSelected);\r
}\r
}\r
if (model.getRowCount() == 0) {\r
return;\r
}\r
- \r
+ docConsole.setSaved(false);\r
model.setRowCount(0);\r
sfc.removeSpdLibClass();\r
}\r
}\r
if (!DataValidation.isPathAndFilename(row[cnHdrFile])) {\r
JOptionPane.showMessageDialog(frame, "Include Header is NOT PathAndFilename Type.");\r
+ return false;\r
}\r
if (row[cnHelpText].length() == 0) {\r
JOptionPane.showMessageDialog(frame, "Help Text Must NOT be empty.");\r
+ return false;\r
+ }\r
+ if (row[cnRecInstVer].length() > 0) {\r
+ if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r
+ JOptionPane.showMessageDialog(frame, "Recommended Instance Version is NOT VersionDataType.");\r
+ return false;\r
+ }\r
}\r
return true;\r
}\r
}\r
\r
private String nameToGuid(String name) {\r
- String s = "";\r
+ String s = null;\r
if (!libNameGuidMap.containsKey(name)) {\r
return s;\r
}\r