import java.awt.Dimension;\r
import java.awt.Toolkit;\r
\r
+import javax.swing.DefaultCellEditor;\r
import javax.swing.JFrame;\r
import javax.swing.JOptionPane;\r
import javax.swing.JPanel;\r
\r
import org.tianocore.frameworkwizard.common.DataValidation;\r
import org.tianocore.frameworkwizard.common.GlobalData;\r
+import org.tianocore.frameworkwizard.common.IDefaultTableModel;\r
import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r
import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
private JLabel jLabelPcdHelp = null;\r
private JButton jButtonOk = null;\r
private JButton jButtonCancel = null;\r
- private PartialEditableTableModel model = null;\r
- private LibraryTableModel selectedInstancesTableModel = null;\r
- private LibraryTableModel libClassTableModel = null;\r
- private LibraryTableModel libInstanceTableModel = null;\r
+ private IDefaultTableModel model = null;\r
+ private IDefaultTableModel selectedInstancesTableModel = null;\r
+ private IDefaultTableModel libClassTableModel = null;\r
+ private IDefaultTableModel libInstanceTableModel = null;\r
private DefaultTableModel optionsTableModel = null;\r
private FpdFileContents ffc = null;\r
private String moduleKey = null;\r
resolveLibraryInstances(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]);\r
selectedInstancesTableModel.addRow(saa[i]);\r
}\r
- \r
- \r
}\r
}\r
+ showClassToResolved();\r
}\r
\r
public void initFvInfo (String key) {\r
\r
}\r
\r
- showClassToResolved();\r
+// showClassToResolved();\r
}\r
catch(Exception e) {\r
e.printStackTrace();\r
private ArrayList<String> getInstancesForClass(String cls, PackageIdentification[] depPkgList) throws Exception{\r
ArrayList<String> al = new ArrayList<String>();\r
\r
- for (int i = 0; i < depPkgList.length; ++i) {\r
+// for (int i = 0; i < depPkgList.length; ++i) {\r
Iterator ismi = GlobalData.vModuleList.iterator();\r
while(ismi.hasNext()) {\r
ModuleIdentification mi = (ModuleIdentification)ismi.next();\r
- if (!mi.getPackageId().getGuid().equalsIgnoreCase(depPkgList[i].getGuid())) {\r
- continue;\r
- }\r
+// if (!mi.getPackageId().getGuid().equalsIgnoreCase(depPkgList[i].getGuid())) {\r
+// continue;\r
+// }\r
String[] clsProduced = getClassProduced(mi);\r
\r
boolean isPotential = false;\r
}\r
if (isPotential) {\r
al.add(mi.getGuid() + " " + mi.getVersion() + " " + \r
- depPkgList[i].getGuid() + " " + depPkgList[i].getVersion());\r
+ mi.getPackageId().getGuid() + " " + mi.getPackageId().getVersion());\r
}\r
}\r
- }\r
+// }\r
\r
return al;\r
}\r
}\r
libInstanceTableModel.setRowCount(0);\r
}\r
+ \r
+ private void addLibInstance (ModuleIdentification libMi) {\r
+ \r
+ ffc.genLibraryInstance(libMi, moduleKey);\r
+ //\r
+ // Add pcd information of selected instance to current moduleSA\r
+ //\r
+ try{\r
+ ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
+ }\r
+ catch (Exception exception) {\r
+ JOptionPane.showMessageDialog(frame, "Adding Instance" + libMi.getName() + ": "+ exception.getMessage());\r
+ }\r
+ \r
+ }\r
/**\r
* This method initializes this\r
* \r
*/\r
private void initialize() {\r
this.setSize(664, 515);\r
+ this.setResizable(false);\r
this.centerWindow();\r
this.setModal(true);\r
this.setTitle("Module Settings");\r
*/\r
private JTable getJTablePcd() {\r
if (jTablePcd == null) {\r
- model = new PartialEditableTableModel();\r
+ model = new IDefaultTableModel();\r
jTablePcd = new JTable(model);\r
jTablePcd.setRowHeight(20);\r
jTablePcd.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
}\r
else{\r
int selectedRow = lsm.getMinSelectionIndex();\r
- String cName = jTablePcd.getValueAt(selectedRow, 0)+"";\r
- String tsGuid = jTablePcd.getValueAt(selectedRow, 1)+"";\r
+ String cName = model.getValueAt(selectedRow, 0)+"";\r
+ String tsGuid = model.getValueAt(selectedRow, 1)+"";\r
+ String itemType = model.getValueAt(selectedRow, 2)+"";\r
String[] pcdInfo = {"", ""};\r
getPcdInfo(cName, tsGuid, pcdInfo);\r
jTextAreaPcdHelp.setText(pcdInfo[0]);\r
initComboBox(pcdInfo[1]);\r
- jComboBoxItemType.setSelectedItem(pcdInfo[1]);\r
+ jComboBoxItemType.setSelectedItem(itemType);\r
jTextFieldMaxDatumSize.setEnabled(true);\r
jTextFieldMaxDatumSize.setVisible(true);\r
jTextFieldMaxDatumSize.setText(jTablePcd.getValueAt(selectedRow, 4)+"");\r
jTextFieldMaxDatumSize.setEnabled(false);\r
}\r
\r
- if (!jTablePcd.getValueAt(selectedRow, 2).equals("DYNAMIC") && !jTablePcd.getValueAt(selectedRow, 2).equals("DYNAMIC_EX")) {\r
- jTextFieldPcdDefault.setText(jTablePcd.getValueAt(selectedRow, 6)+"");\r
- if (jTablePcd.getValueAt(selectedRow, 2).equals("FEATURE_FLAG")){\r
+ if (!model.getValueAt(selectedRow, 2).equals("DYNAMIC") && !model.getValueAt(selectedRow, 2).equals("DYNAMIC_EX")) {\r
+ jTextFieldPcdDefault.setText(model.getValueAt(selectedRow, 6)+"");\r
+ if (model.getValueAt(selectedRow, 2).equals("FEATURE_FLAG")){\r
jTextFieldPcdDefault.setVisible(false);\r
jComboBoxFeatureFlagValue.setVisible(true);\r
jComboBoxFeatureFlagValue.setSelectedItem(jTablePcd.getValueAt(selectedRow, 6)+"");\r
}\r
});\r
\r
- jTablePcd.getModel().addTableModelListener(new TableModelListener() {\r
- public void tableChanged(TableModelEvent arg0) {\r
- // TODO Auto-generated method stub\r
-// int row = arg0.getFirstRow();\r
-// TableModel m = (TableModel)arg0.getSource();\r
- \r
- if (arg0.getType() == TableModelEvent.UPDATE){\r
- //update xml doc here.\r
- \r
- }\r
- }\r
- });\r
}\r
return jTablePcd;\r
}\r
*/\r
private JTable getJTableSelectedInstances() {\r
if (jTableSelectedInstances == null) {\r
- selectedInstancesTableModel = new LibraryTableModel();\r
+ selectedInstancesTableModel = new IDefaultTableModel();\r
selectedInstancesTableModel.addColumn("Name");\r
selectedInstancesTableModel.addColumn("ModuleGUID");\r
selectedInstancesTableModel.addColumn("ModuleVersion");\r
*/\r
private JTable getJTableLibClass() {\r
if (jTableLibClass == null) {\r
- libClassTableModel = new LibraryTableModel();\r
+ libClassTableModel = new IDefaultTableModel();\r
libClassTableModel.addColumn("LibraryClass");\r
jTableLibClass = new JTable(libClassTableModel);\r
jTableLibClass.setRowHeight(20);\r
*/\r
private JTable getJTableLibInstances() {\r
if (jTableLibInstances == null) {\r
- libInstanceTableModel = new LibraryTableModel();\r
+ libInstanceTableModel = new IDefaultTableModel();\r
libInstanceTableModel.addColumn("Name");\r
libInstanceTableModel.addColumn("ModuleGUID");\r
libInstanceTableModel.addColumn("ModuleVersion");\r
libInstanceTableModel.getValueAt(row, 3) + " " +\r
libInstanceTableModel.getValueAt(row, 4);\r
ModuleIdentification libMi = WorkspaceProfile.getModuleId(instanceValue);\r
- ffc.genLibraryInstance(libMi, moduleKey);\r
- //\r
- // Add pcd information of selected instance to current moduleSA\r
- //\r
- try{\r
- ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
- }\r
- catch (Exception exception) {\r
- JOptionPane.showMessageDialog(frame, "Adding Instance" + s[0] + ": "+ exception.getMessage());\r
- }\r
+ addLibInstance (libMi);\r
resolveLibraryInstances(instanceValue);\r
+ showClassToResolved();\r
}\r
});\r
}\r
optionsTableModel.addColumn("Contents");\r
jTableModuleSaOptions = new JTable(optionsTableModel);\r
jTableModuleSaOptions.setRowHeight(20);\r
+ \r
+ javax.swing.table.TableColumn toolFamilyCol = jTableModuleSaOptions.getColumnModel().getColumn(1);\r
+ JComboBox cb = new JComboBox();\r
+ cb.addItem("MSFT");\r
+ cb.addItem("GCC");\r
+ cb.addItem("CYGWIN");\r
+ cb.addItem("INTEL");\r
+ cb.addItem("USER_DEFINED");\r
+ toolFamilyCol.setCellEditor(new DefaultCellEditor(cb));\r
+ \r
Vector<String> vArch = new Vector<String>();\r
vArch.add("IA32");\r
vArch.add("X64");\r
vArch.add("ARM");\r
vArch.add("PPC");\r
jTableModuleSaOptions.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch));\r
+ \r
+ jTableModuleSaOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor());\r
+ \r
jTableModuleSaOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
jTableModuleSaOptions.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
jTableModuleSaOptions.getModel().addTableModelListener(new TableModelListener() {\r
jPanelPcdFieldsThirdRow.add(jLabelPcdDefaultValue, null);\r
jPanelPcdFieldsThirdRow.add(getJTextFieldPcdDefault(), null);\r
jPanelPcdFieldsThirdRow.add(getJComboBoxFeatureFlagValue(), null);\r
+ jPanelPcdFieldsThirdRow.add(getJButtonUpdatePcd(), null);\r
}\r
return jPanelPcdFieldsThirdRow;\r
}\r
jPanelPcdFieldsFirstRow.setLayout(flowLayout1);\r
jPanelPcdFieldsFirstRow.add(jLabelItemType, null);\r
jPanelPcdFieldsFirstRow.add(getJComboBoxItemType(), null);\r
- jPanelPcdFieldsFirstRow.add(getJButtonUpdatePcd(), null);\r
}\r
return jPanelPcdFieldsFirstRow;\r
}\r
jComboBoxItemType.addItemListener(new java.awt.event.ItemListener() {\r
public void itemStateChanged(java.awt.event.ItemEvent e) {\r
int row = jTablePcd.getSelectedRow();\r
- if (row < 0 || jTablePcd.getValueAt(row, 2).equals(jComboBoxItemType.getSelectedItem())) {\r
+ if (row < 0 || model.getValueAt(row, 2).equals(jComboBoxItemType.getSelectedItem())) {\r
return;\r
}\r
if (jComboBoxItemType.getItemCount() == 3) {\r
if (!jComboBoxItemType.getSelectedItem().equals("DYNAMIC")) {\r
- pcdDynamicToNonDynamic(jTablePcd.getValueAt(row, 0)+"", jTablePcd.getValueAt(row, 1)+"");\r
+ pcdDynamicToNonDynamic(model.getValueAt(row, 0)+"", model.getValueAt(row, 1)+"");\r
if (jComboBoxItemType.getSelectedItem().equals("FIXED_AT_BUILD")) {\r
jTextFieldPcdDefault.setText("");\r
jTextFieldPcdDefault.setEnabled(true);\r
}\r
}\r
else{\r
- pcdNonDynamicToDynamic(jTablePcd.getValueAt(row, 0)+"", jTablePcd.getValueAt(row, 1)+"");\r
+ pcdNonDynamicToDynamic(model.getValueAt(row, 0)+"", model.getValueAt(row, 1)+"");\r
}\r
}\r
}\r
\r
ArrayList<String> al = ffc.getDynPcdMapValue(cName + " " + tsGuid);\r
for (int i = 0; i < al.size(); ++i) {\r
- String[] s = al.get(i).split(" ");\r
- String mKey = s[0] + s[1] + s[2] + s[3];\r
+ String mKey = moduleInfo (al.get(i));\r
ffc.updatePcdData(mKey, cName, tsGuid, jComboBoxItemType.getSelectedItem()+"", maxSize, value);\r
- s[4] = jComboBoxItemType.getSelectedItem()+"";\r
- al.set(i, s[0]+" "+s[1]+" "+s[2]+" "+s[3]+" "+s[4]);\r
+ String itemType = jComboBoxItemType.getSelectedItem()+"";\r
+ al.set(i, mKey + " " + itemType);\r
}\r
\r
ffc.removeDynamicPcdBuildData(cName, tsGuid);\r
private void pcdNonDynamicToDynamic(String cName, String tsGuid) {\r
ArrayList<String> al = ffc.getDynPcdMapValue(cName + " " + tsGuid);\r
for (int i = 0; i < al.size(); ++i) {\r
- String[] s = al.get(i).split(" ");\r
- String mKey = s[0] + " " + s[1]+ " " + s[2] + " " + s[3];\r
+ String mKey = moduleInfo (al.get(i));\r
ffc.updatePcdData(mKey, cName, tsGuid, jComboBoxItemType.getSelectedItem()+"", jTextFieldMaxDatumSize.getText(), jTextFieldPcdDefault.isVisible() ? jTextFieldPcdDefault.getText() : jComboBoxFeatureFlagValue.getSelectedItem()+"");\r
- s[4] = jComboBoxItemType.getSelectedItem()+"";\r
- al.set(i, s[0]+" "+s[1]+" "+s[2]+" "+s[3]+" "+s[4]);\r
+ String itemType = jComboBoxItemType.getSelectedItem()+"";\r
+ al.set(i, mKey + " " + itemType);\r
}\r
try{\r
ffc.addDynamicPcdBuildData(cName, jTablePcd.getValueAt(jTablePcd.getSelectedRow(), 3), tsGuid, "DYNAMIC", jTablePcd.getValueAt(jTablePcd.getSelectedRow(), 5)+"", jTextFieldPcdDefault.isVisible() ? jTextFieldPcdDefault.getText() : jComboBoxFeatureFlagValue.getSelectedItem()+"");\r
JOptionPane.showMessageDialog(frame, "PCD value format: " + e.getMessage());\r
}\r
}\r
+\r
+private String moduleInfo (String pcdInfo) {\r
+ \r
+ return pcdInfo.substring(0, pcdInfo.lastIndexOf(" "));\r
+}\r
+\r
/**\r
* This method initializes jTextFieldMaxDatumSize\r
* \r
jComboBoxFeatureFlagValue = new JComboBox();\r
jComboBoxFeatureFlagValue.setPreferredSize(new java.awt.Dimension(100,20));\r
jComboBoxFeatureFlagValue.setVisible(false);\r
- jComboBoxFeatureFlagValue.addItem("true");\r
- jComboBoxFeatureFlagValue.addItem("false");\r
+ jComboBoxFeatureFlagValue.addItem("TRUE");\r
+ jComboBoxFeatureFlagValue.addItem("FALSE");\r
}\r
return jComboBoxFeatureFlagValue;\r
}\r
\r
\r
} // @jve:decl-index=0:visual-constraint="10,10"\r
-\r
-class PartialEditableTableModel extends DefaultTableModel {\r
- /**\r
- * \r
- */\r
- private static final long serialVersionUID = 1L;\r
-\r
- public boolean isCellEditable(int row, int col) {\r
- switch (col){\r
- case 2:\r
- return false;\r
- default:\r
- return false; \r
- }\r
- \r
- }\r
-}\r
-\r
-class LibraryTableModel extends DefaultTableModel {\r
- /**\r
- * \r
- */\r
- private static final long serialVersionUID = 1L;\r
-\r
- public boolean isCellEditable(int row, int col) {\r
- return false;\r
- }\r
-}\r