import javax.swing.ListSelectionModel;\r
\r
import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.DataValidation;\r
import org.tianocore.frameworkwizard.common.GlobalData;\r
import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
private JButton jButtonFvInFdfOptions = null;\r
private JScrollPane jScrollPaneFvAdditional = null;\r
private JTable jTableFvAdditional = null;\r
- private DefaultTableModel fvAddtionalTableModel = null; // @jve:decl-index=0:visual-constraint=""\r
+ private DefaultTableModel fvAdditionalTableModel = null; // @jve:decl-index=0:visual-constraint=""\r
private JButton jButtonAddFv = null;\r
private JButton jButtonDelFv = null;\r
private JButton jButtonAddFvOptions = null;\r
private int tabIndexForFv = -1;\r
private int selectedRowInFvAdditionalTable = -1;\r
private String oldFvName = null;\r
+ private Vector<String> vBlockSize = new Vector<String>();\r
+ private String erasePolarity = null;\r
+ boolean memModified = false;\r
\r
\r
public FpdFlash() {\r
fvImageParaTableModel.setRowCount(0);\r
fvPropertyTableModel.setRowCount(0);\r
\r
- if (ffc.getFvImagesFvImageCount() == 0) {\r
+ if (ffc.getFvImagesFvImageCount("Attributes") == 0) {\r
return;\r
}\r
- String[][] saa = new String[ffc.getFvImagesFvImageCount()][2];\r
- ffc.getFvImagesFvImages(saa);\r
- \r
+ String[][] saa = new String[ffc.getFvImagesFvImageCount("Attributes")][2];\r
+ ffc.getFvImagesFvImages(saa, "Attributes");\r
+ \r
int i = 0;\r
while (i < saa.length) {\r
fvImageParaTableModel.addRow(saa[i]);\r
private JComboBox getJComboBoxFvParaType() {\r
if (jComboBoxFvParaType == null) {\r
jComboBoxFvParaType = new JComboBox();\r
- jComboBoxFvParaType.addItem("ImageName");\r
+// jComboBoxFvParaType.addItem("ImageName");\r
jComboBoxFvParaType.addItem("Attributes");\r
jComboBoxFvParaType.addItem("Options");\r
- jComboBoxFvParaType.addItem("Components");\r
+// jComboBoxFvParaType.addItem("Components");\r
jComboBoxFvParaType.setPreferredSize(new java.awt.Dimension(180,20));\r
jComboBoxFvParaType.setEnabled(false);\r
jComboBoxFvParaType.addItemListener(new ItemListener() {\r
fvImageParaTableModel.addColumn("Type");\r
\r
\r
- TableColumn typeCol = jTableFvInfo.getColumnModel().getColumn(1);\r
- JComboBox cb = new JComboBox();\r
- cb.addItem("ImageName");\r
- cb.addItem("Attributes");\r
- cb.addItem("Options");\r
- cb.addItem("Components");\r
- typeCol.setCellEditor(new DefaultCellEditor(cb));\r
+// TableColumn typeCol = jTableFvInfo.getColumnModel().getColumn(1);\r
+// JComboBox cb = new JComboBox();\r
+// cb.addItem("ImageName");\r
+// cb.addItem("Attributes");\r
+// cb.addItem("Options");\r
+// cb.addItem("Components");\r
+// typeCol.setCellEditor(new DefaultCellEditor(cb));\r
\r
jTableFvInfo.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
jTableFvInfo.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
if (jButtonDelFvImage == null) {\r
jButtonDelFvImage = new JButton();\r
jButtonDelFvImage.setPreferredSize(new java.awt.Dimension(120,20));\r
-// jButton6.setEnabled(false);\r
+ jButtonDelFvImage.setEnabled(false);\r
jButtonDelFvImage.setText("Delete Row");\r
jButtonDelFvImage.addActionListener(new AbstractAction() {\r
/**\r
}\r
\r
private void initFvAdditionalTable() {\r
- \r
+ Vector<String> vFvNames = new Vector<String>();\r
+ ffc.getFvImagesFvImageFvImageNames(vFvNames);\r
+ for (int i = 0; i < vFvNames.size(); ++i) {\r
+ String fvName = vFvNames.get(i);\r
+ if (fvNameExists(fvName)) {\r
+ continue;\r
+ }\r
+ HashMap<String, String> mFvOpts = new HashMap<String, String>();\r
+ ffc.getFvImagesFvImageOptions(fvName, mFvOpts);\r
+ String bSize = "";\r
+ String numBlks = "";\r
+ String fvSize = "";\r
+ String fvFile = "";\r
+ if (mFvOpts.get("EFI_FILE_NAME") != null) {\r
+ fvFile = mFvOpts.get("EFI_FILE_NAME");\r
+ }\r
+ if (mFvOpts.get("EFI_BLOCK_SIZE") != null && mFvOpts.get("EFI_NUM_BLOCKS") != null) {\r
+ bSize = mFvOpts.get("EFI_BLOCK_SIZE");\r
+ numBlks = mFvOpts.get("EFI_NUM_BLOCKS");\r
+ boolean blockSizeWellFormat = true;\r
+ boolean numOfBlockWellFormat = true;\r
+ if (!DataValidation.isHexDoubleWordDataType(bSize) && !DataValidation.isInt(bSize)) {\r
+ blockSizeWellFormat = false;\r
+ JOptionPane.showMessageDialog(frame, fvName + " block size bad format.");\r
+ } \r
+ if (!DataValidation.isHexDoubleWordDataType(numBlks) && !DataValidation.isInt(numBlks)) {\r
+ numOfBlockWellFormat = false;\r
+ JOptionPane.showMessageDialog(frame, fvName + " number of blocks bad format.");\r
+ }\r
+ if (blockSizeWellFormat && numOfBlockWellFormat) {\r
+ int size = Integer.decode(bSize);\r
+ int num = Integer.decode(numBlks);\r
+ fvSize = size*num + "";\r
+ }\r
+ }\r
+ fvAdditionalTableModel.addRow(new String[]{fvName, fvSize, fvFile});\r
+ addTabForFv(new FvInfoFromFdf(fvName, "", ""));\r
+ }\r
}\r
\r
private void initFvInFdfTable(String fdfPath){\r
Vector<FvInfoFromFdf> vFvInfo = new Vector<FvInfoFromFdf>();\r
getFvInfoFromFdf(fdfPath, vFvInfo);\r
+ getFlashInfoFromFdf (fdfPath, vBlockSize, erasePolarity);\r
+ ffc.setTypedFvImageNameValue("Attributes", "ErasePolarity", erasePolarity);\r
+ // BugBug: assume all blocks have same size;\r
+ String blkSize = vBlockSize.get(0);\r
+ \r
getFvInFdfTableModel().setRowCount(0);\r
for (int j = 0; j < vFvInfo.size(); ++j) {\r
FvInfoFromFdf fvInfo = vFvInfo.get(j);\r
String[] row = {fvInfo.getFvName(), fvInfo.getSize(), fvInfo.getEfiFileName()};\r
getFvInFdfTableModel().addRow(row);\r
+ try {\r
+ int blockSize = Integer.decode(blkSize);\r
+ int fvSize = Integer.decode(row[1]);\r
+ int numBlocks = fvSize/blockSize;\r
+ // if no options for this FV before, generate a new options entry for this FV.\r
+ if (ffc.getFvImagesFvImageWithName(row[0], "Options") == null) {\r
+ HashMap<String, String> mOptions = new HashMap<String, String>();\r
+ mOptions.put("EFI_BLOCK_SIZE", blkSize);\r
+ mOptions.put("EFI_NUM_BLOCKS", numBlocks+"");\r
+ mOptions.put("EFI_FILE_NAME", row[2]);\r
+ ffc.genFvImagesFvImage(new String[]{row[0]}, "Options", mOptions);\r
+ memModified = true;\r
+ }\r
+ else {\r
+ ffc.setTypedNamedFvImageNameValue(row[0], "Options", "EFI_BLOCK_SIZE", blkSize);\r
+ ffc.setTypedNamedFvImageNameValue(row[0], "Options", "EFI_NUM_BLOCKS", numBlocks + "");\r
+ ffc.setTypedNamedFvImageNameValue(row[0], "Options", "EFI_FILE_NAME", row[2]);\r
+ }\r
+ }\r
+ catch (NumberFormatException e){\r
+ JOptionPane.showMessageDialog(frame, e.getMessage());\r
+ }\r
}\r
\r
for (int k = 0; k < vFvInfo.size(); ++k) {\r
FvInfoFromFdf fvInfo = vFvInfo.get(k);\r
addTabForFv(fvInfo);\r
}\r
+ \r
}\r
\r
private void addTabForFv (FvInfoFromFdf fvInfo) {\r
jButtonUpdateFvImage = new JButton();\r
jButtonUpdateFvImage.setPreferredSize(new Dimension(120, 20));\r
jButtonUpdateFvImage.setActionCommand("Update");\r
+ jButtonUpdateFvImage.setEnabled(false);\r
jButtonUpdateFvImage.setText("Update FV");\r
jButtonUpdateFvImage.addActionListener(new java.awt.event.ActionListener() {\r
public void actionPerformed(java.awt.event.ActionEvent e) {\r
jTableFvAdditional = new JTable();\r
jTableFvAdditional.setRowHeight(20);\r
jTableFvAdditional.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION);\r
- jTableFvAdditional.setModel(getFvAddtionalTableModel());\r
+ jTableFvAdditional.setModel(getFvAdditionalTableModel());\r
\r
jTableFvAdditional.getSelectionModel().addListSelectionListener(new ListSelectionListener() {\r
public void valueChanged(ListSelectionEvent e) {\r
return jTableFvAdditional;\r
}\r
\r
- private boolean fvNameExists (String fvName) {\r
+ private boolean fvNameExistsInFvInFdfTable (String fvName) {\r
for (int i = 0; i < jTableFvInFdf.getRowCount(); ++i) {\r
if (fvInFdfTableModel.getValueAt(i, 0).equals(fvName)) {\r
return true;\r
}\r
}\r
+ return false;\r
+ }\r
+ \r
+ private boolean fvNameExists (String fvName) {\r
+ if (fvNameExistsInFvInFdfTable(fvName)) {\r
+ return true;\r
+ }\r
+ \r
for (int j = 0; j < jTableFvAdditional.getRowCount(); ++j) {\r
- if (fvAddtionalTableModel.getValueAt(j, 0).equals(fvName) && j != selectedRowInFvAdditionalTable) {\r
+ if (fvAdditionalTableModel.getValueAt(j, 0).equals(fvName) && j != selectedRowInFvAdditionalTable) {\r
return true;\r
}\r
}\r
}\r
\r
/**\r
- * This method initializes fvAddtionalTableModel \r
+ * This method initializes fvAdditionalTableModel \r
* \r
* @return javax.swing.table.DefaultTableModel \r
*/\r
- private DefaultTableModel getFvAddtionalTableModel() {\r
- if (fvAddtionalTableModel == null) {\r
- fvAddtionalTableModel = new DefaultTableModel();\r
- fvAddtionalTableModel.addColumn("FV Name");\r
- fvAddtionalTableModel.addColumn("Size");\r
- fvAddtionalTableModel.addColumn("Corresponding File Name");\r
+ private DefaultTableModel getFvAdditionalTableModel() {\r
+ if (fvAdditionalTableModel == null) {\r
+ fvAdditionalTableModel = new DefaultTableModel();\r
+ fvAdditionalTableModel.addColumn("FV Name");\r
+ fvAdditionalTableModel.addColumn("Size");\r
+ fvAdditionalTableModel.addColumn("Corresponding File Name");\r
}\r
- return fvAddtionalTableModel;\r
+ return fvAdditionalTableModel;\r
}\r
\r
/**\r
jTableFvAdditional.getCellEditor().stopCellEditing();\r
}\r
String[] row = {"", "", ""};\r
- fvAddtionalTableModel.addRow(row);\r
+ fvAdditionalTableModel.addRow(row);\r
}\r
});\r
}\r
if (jButtonDelFv == null) {\r
jButtonDelFv = new JButton();\r
jButtonDelFv.setPreferredSize(new java.awt.Dimension(80,20));\r
- jButtonDelFv.setEnabled(false);\r
+ jButtonDelFv.setEnabled(true);\r
jButtonDelFv.setText("Delete");\r
jButtonDelFv.addActionListener(new java.awt.event.ActionListener() {\r
public void actionPerformed(java.awt.event.ActionEvent e) {\r
- System.out.println("actionPerformed()"); // TODO Auto-generated Event stub actionPerformed()\r
+ //delete row in FvAdditional table.\r
+ int selectedRow = jTableFvAdditional.getSelectedRow();\r
+ if (selectedRow < 0) {\r
+ return;\r
+ }\r
+ String fvName = fvAdditionalTableModel.getValueAt(selectedRow, 0) + "";\r
+ fvAdditionalTableModel.removeRow(selectedRow);\r
+ //\r
+ //delete tab with selected FV name.\r
+ //\r
+ jTabbedPane.removeTabAt(jTabbedPane.indexOfTab(fvName));\r
+ //delete FV Name from FvImages element.\r
+ ffc.updateFvImageNameAll(fvName, null);\r
+ //delete FvBinding from ModuleSA.\r
+ ffc.removeFvBindingAll(fvName);\r
+ docConsole.setSaved(false);\r
}\r
});\r
}\r
if (jTableFvInfo.isEditing()) {\r
jTableFvInfo.getCellEditor().stopCellEditing();\r
}\r
+ if (jTableFvAdditional.isEditing()) {\r
+ jTableFvAdditional.getCellEditor().stopCellEditing();\r
+ }\r
}\r
});\r
}\r
return jContentPane;\r
}\r
\r
+ private void getFlashInfoFromFdf (String fdfPath, Vector<String> vBlockSize, String erasePolarity) {\r
+ File fdf = new File(fdfPath);\r
+ if (!fdf.exists()) {\r
+ return;\r
+ }\r
+ int lines = 0;\r
+\r
+ try {\r
+ FileReader reader = new FileReader(fdf);\r
+ BufferedReader in = new BufferedReader(reader);\r
+ String str;\r
+\r
+ while ((str = in.readLine()) != null) {\r
+ ++lines;\r
+ str = str.trim();\r
+ //\r
+ // skip empty line, comment (start with //) \r
+ //\r
+ if (str.length() == 0 || str.startsWith("//")) {\r
+ continue;\r
+ }\r
+ //\r
+ // ErasePolarity\r
+ //\r
+ if (str.startsWith("ErasePolarity")) {\r
+ erasePolarity = str.substring(str.indexOf("=") + 1, str.lastIndexOf(","));\r
+ }\r
+ //\r
+ // dig into Block section.\r
+ //\r
+ if (str.startsWith("Block") && str.endsWith("}")) {\r
+ String[] blockSec = str.split(",");\r
+ String nv = blockSec[1].trim();\r
+ String[] sizeSec = nv.split("=");\r
+ vBlockSize.add(sizeSec[1].trim());\r
+ }\r
+ \r
+ }\r
+ \r
+ reader.close();\r
+ in.close();\r
+ }\r
+ catch (Exception e) {\r
+ \r
+ }\r
+ }\r
+ \r
private void getFvInfoFromFdf(String fdfPath, Vector<FvInfoFromFdf> vFvInfo) {\r
File fdf = new File(fdfPath);\r
if (!fdf.exists()) {\r
private static final long serialVersionUID = 1L;\r
\r
public boolean isCellEditable(int row, int col) {\r
- if (getValueAt(row, 1).equals("ImageName") && col >=1) {\r
- return false;\r
- }\r
- return true;\r
+// if (getValueAt(row, 1).equals("ImageName") && col >=1) {\r
+// return false;\r
+// }\r
+// return true;\r
+ return false;\r
}\r
}\r
\r
projects / mirror_edk2.git / blobdiff