\r
import java.awt.FlowLayout;\r
import java.awt.event.ActionEvent;\r
+import java.awt.event.ComponentAdapter;\r
+import java.awt.event.ComponentEvent;\r
import java.awt.event.ItemEvent;\r
import java.awt.event.ItemListener;\r
import java.io.BufferedReader;\r
import java.io.File;\r
import java.io.FileReader;\r
+import java.util.ArrayList;\r
+import java.util.HashMap;\r
import java.util.Iterator;\r
import java.util.LinkedHashMap;\r
import java.util.Map;\r
jPanelFdf.add(getJPanelFdfN(), java.awt.BorderLayout.NORTH);\r
jPanelFdf.add(getJPanelFdfS(), java.awt.BorderLayout.SOUTH);\r
jPanelFdf.add(getJSplitPaneFdfC(), java.awt.BorderLayout.CENTER);\r
-// jPanelFdf.addComponentListener(new ComponentAdapter(){\r
-// public void componentShown(ComponentEvent e) {\r
+ jPanelFdf.addComponentListener(new ComponentAdapter(){\r
+ public void componentShown(ComponentEvent e) {\r
// if (ffc.getFlashDefinitionFile() != null) {\r
// jTextFieldFdf.setText(ffc.getFlashDefinitionFile());\r
+// initFvInFdfTable(System.getenv("WORKSPACE") + File.separator + jTextFieldFdf.getText());\r
+// \r
// }\r
-// }\r
-// public void componentHidden(ComponentEvent e) {\r
-// if (jCheckBoxFdf.isSelected()) {\r
-// ffc.genFlashDefinitionFile(jTextFieldFdf.getText());\r
-// }\r
-// }\r
-// });\r
+ }\r
+ public void componentHidden(ComponentEvent e) {\r
+ if (jCheckBoxFdf.isSelected()) {\r
+ ffc.genFlashDefinitionFile(jTextFieldFdf.getText());\r
+ }\r
+ }\r
+ });\r
}\r
return jPanelFdf;\r
}\r
if (jTextFieldFdf == null) {\r
jTextFieldFdf = new JTextField();\r
jTextFieldFdf.setEnabled(false);\r
+ jTextFieldFdf.setEditable(false);\r
jTextFieldFdf.setPreferredSize(new Dimension(300, 20));\r
jTextFieldFdf.addFocusListener(new java.awt.event.FocusAdapter() {\r
public void focusLost(java.awt.event.FocusEvent e) {\r
jTextFieldFdf.setText(filePath.substring(wsDir.length() + 1).replace('\\', '/'));\r
ffc.genFlashDefinitionFile(jTextFieldFdf.getText());\r
docConsole.setSaved(false);\r
- Vector<FvInfoFromFdf> vFvInfo = new Vector<FvInfoFromFdf>();\r
- getFvInfoFromFdf(filePath, vFvInfo);\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
- }\r
+ initFvInFdfTable(filePath);\r
}\r
}\r
\r
return jButtonFdfBrowse;\r
}\r
\r
+ private void initFvInFdfTable(String fdfPath){\r
+ Vector<FvInfoFromFdf> vFvInfo = new Vector<FvInfoFromFdf>();\r
+ getFvInfoFromFdf(fdfPath, vFvInfo);\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
+ }\r
+\r
+ for (int k = 0; k < vFvInfo.size(); ++k) {\r
+ FvInfoFromFdf fvInfo = vFvInfo.get(k);\r
+ addTabForFv(fvInfo);\r
+ }\r
+ }\r
+ \r
+ private void addTabForFv (FvInfoFromFdf fvInfo) {\r
+ String fvName = fvInfo.getFvName();\r
+ String outputFile = fvInfo.getEfiFileName();\r
+ for (int i = 2; i < jTabbedPane.getTabCount(); ++i) {\r
+ if (jTabbedPane.getTitleAt(i).equals(fvName)) {\r
+ return;\r
+ }\r
+ }\r
+ jTabbedPane.addTab(fvName, null, new ModuleOrderPane(fvName, outputFile), null);\r
+ }\r
/**\r
* This method initializes jTextField4 \r
* \r
if (jButtonFvInFdfOptions == null) {\r
jButtonFvInFdfOptions = new JButton();\r
jButtonFvInFdfOptions.setPreferredSize(new java.awt.Dimension(80,20));\r
+ jButtonFvInFdfOptions.setEnabled(false);\r
jButtonFvInFdfOptions.setText("Options");\r
jButtonFvInFdfOptions.addActionListener(new java.awt.event.ActionListener() {\r
public void actionPerformed(java.awt.event.ActionEvent e) {\r
if (jButtonAddFv == null) {\r
jButtonAddFv = new JButton();\r
jButtonAddFv.setPreferredSize(new java.awt.Dimension(80,20));\r
+ jButtonAddFv.setEnabled(false);\r
jButtonAddFv.setText("New");\r
+ jButtonAddFv.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
+ }\r
+ });\r
}\r
return jButtonAddFv;\r
}\r
if (jButtonDelFv == null) {\r
jButtonDelFv = new JButton();\r
jButtonDelFv.setPreferredSize(new java.awt.Dimension(80,20));\r
+ jButtonDelFv.setEnabled(false);\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
+ }\r
+ });\r
}\r
return jButtonDelFv;\r
}\r
if (jButtonAddFvOptions == null) {\r
jButtonAddFvOptions = new JButton();\r
jButtonAddFvOptions.setPreferredSize(new java.awt.Dimension(80,20));\r
+ jButtonAddFvOptions.setEnabled(false);\r
jButtonAddFvOptions.setText("Options");\r
+ jButtonAddFvOptions.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
+ }\r
+ });\r
}\r
return jButtonAddFvOptions;\r
}\r
}\r
\r
String fdfPath = System.getenv("WORKSPACE") + File.separator + fdfFile;\r
- Vector<FvInfoFromFdf> vFvInfo = new Vector<FvInfoFromFdf>();\r
- getFvInfoFromFdf(fdfPath, vFvInfo);\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
- }\r
- \r
-\r
- for (int k = 0; k < vFvInfo.size(); ++k) {\r
- FvInfoFromFdf fvInfo = vFvInfo.get(k);\r
- getJTabbedPane().addTab(fvInfo.getFvName(), null, new ModuleOrderPane(), null);\r
-\r
- }\r
+ initFvInFdfTable(fdfPath);\r
}\r
\r
private void getOptionNameValue(Map<String, String> m){\r
}\r
\r
}\r
- } catch (Exception e) {\r
+ \r
+ reader.close();\r
+ in.close();\r
+ }\r
+ catch (Exception e) {\r
\r
}\r
\r
private JButton jButtonCancel = null;\r
private NonEditableTableModel modInFvTableModel = null;\r
private NonEditableTableModel fpdModTableModel = null;\r
+ private HashMap<String, ModuleIdentification> mGuidToModuleId = null;\r
+ private ArrayList<String> listModGuidInFv = null;\r
+ private String title = null;\r
+ private String outputFileName = null;\r
\r
- public ModuleOrderPane() {\r
+ public ModuleOrderPane(String tabTitle, String file) {\r
super(new BorderLayout());\r
+ title = tabTitle;\r
+ outputFileName = file;\r
+ mGuidToModuleId = new HashMap<String, ModuleIdentification>();\r
+ listModGuidInFv = new ArrayList<String>();\r
add(getJPanelModOrderN(), java.awt.BorderLayout.NORTH);\r
add(getJPanelModOrderS(), java.awt.BorderLayout.SOUTH);\r
add(getJPanelModOrderC(), java.awt.BorderLayout.CENTER);\r
- addComponentListener(new java.awt.event.ComponentAdapter() {\r
- public void componentShown(java.awt.event.ComponentEvent e) {\r
- String title = jTabbedPane.getTitleAt(jTabbedPane.getSelectedIndex()); // TODO Auto-generated Event stub componentShown()\r
- showModulesInFv(title);\r
- showAllModulesInPlatform();\r
- }\r
- });\r
+ showModulesInFv(title);\r
+ showAllModulesInPlatform();\r
}\r
\r
private void showModulesInFv(String fvName) {\r
ffc.getUserExtsIncMods(fvName, saa);\r
\r
for (int i = 0; i < size; ++i) {\r
+ listModGuidInFv.add(saa[i][0].toLowerCase());\r
String name = getModuleName(saa[i][0]);\r
String[] row = { name };\r
modInFvTableModel.addRow(row);\r
Iterator<String> iter = vGuid.iterator();\r
while (iter.hasNext()){\r
String guid = iter.next();\r
- String moduleName = getModuleName(guid);\r
- if (existedInTable(moduleName, modInFvTableModel)) {\r
- vGuid.remove(guid);\r
+// String moduleName = getModuleName(guid);\r
+// if (existedInTable(moduleName, modInFvTableModel)) {\r
+// vGuid.remove(guid);\r
+// }\r
+ if (!listModGuidInFv.contains(guid.toLowerCase())) {\r
+ String[] row = {getModuleName(guid)};\r
+ modInFvTableModel.addRow(row);\r
}\r
}\r
- \r
- for (int j = 0; j < vGuid.size(); ++j) {\r
- String[] row = {getModuleName(vGuid.get(j))};\r
- modInFvTableModel.addRow(row);\r
- }\r
+\r
}\r
\r
private void showAllModulesInPlatform() {\r
private String getModuleName (String guid) {\r
\r
for (int i = 0; i < GlobalData.vModuleList.size(); ++i) {\r
- String mg = GlobalData.vModuleList.get(i).getGuid();\r
+ ModuleIdentification mi = GlobalData.vModuleList.get(i);\r
+ String mg = mi.getGuid();\r
if (mg == null) {\r
continue;\r
}\r
if (mg.equalsIgnoreCase(guid)) {\r
- return GlobalData.vModuleList.get(i).getName();\r
+ mGuidToModuleId.put(guid.toLowerCase(), mi);\r
+ return mi.getName();\r
}\r
}\r
\r
return false;\r
}\r
\r
+ \r
+ \r
/**\r
* This method initializes jPanelModOrderN \r
* \r
jTableModInFv = new JTable(modInFvTableModel);\r
jTableModInFv.setRowHeight(20);\r
jTableModInFv.setShowGrid(false);\r
+ \r
}\r
return jTableModInFv;\r
}\r
jTableFpdModules.setRowHeight(20);\r
jTableFpdModules.setShowGrid(false);\r
fpdModTableModel.addColumn("Modules in Platform");\r
+\r
}\r
return jTableFpdModules;\r
}\r
if (selectedRowLeft < 0) {\r
modInFvTableModel.addRow(row);\r
jTableModInFv.changeSelection(jTableModInFv.getRowCount() - 1, 0, false, false);\r
- fpdModTableModel.removeRow(rowInModel);\r
}\r
else {\r
modInFvTableModel.insertRow(selectedRowLeft, row);\r
jTableModInFv.changeSelection(selectedRowLeft, 0, false, false);\r
}\r
+ fpdModTableModel.removeRow(rowInModel);\r
}\r
});\r
}\r
if (jButtonOk == null) {\r
jButtonOk = new JButton();\r
jButtonOk.setPreferredSize(new java.awt.Dimension(80,20));\r
- jButtonOk.setText("Ok");\r
+ jButtonOk.setText("Save");\r
+ jButtonOk.addActionListener(new java.awt.event.ActionListener() {\r
+ public void actionPerformed(java.awt.event.ActionEvent e) {\r
+ // need reset FvBindings in ModuleSA.\r
+ ffc.removeFvBindingAll(title);\r
+ //\r
+ // collect module order information to store them into <BuildOptions> -> <UserExtensions>.\r
+ // also update the FvBinding info in <ModuleSA>.\r
+ //\r
+ Vector<String[]> vModInFv = new Vector<String[]>();\r
+ for (int i = 0; i < jTableModInFv.getRowCount(); ++i) {\r
+ String moduleName = jTableModInFv.getValueAt(i, 0)+"";\r
+ if (moduleName.length() == 0) {\r
+ continue;\r
+ }\r
+ ModuleIdentification mi = null;\r
+ Set<String> key = mGuidToModuleId.keySet();\r
+ Iterator<String> iter = key.iterator();\r
+ while (iter.hasNext()) {\r
+ String guid = iter.next();\r
+ mi = mGuidToModuleId.get(guid);\r
+ if (mi.getName().equals(moduleName)) {\r
+ String[] sa = {guid, WorkspaceProfile.getModuleBaseName(mi)};\r
+ vModInFv.add(sa);\r
+ ffc.updateFvBindingInModuleSA (mi, title);\r
+ break;\r
+ }\r
+ }\r
+ \r
+ }\r
+ ffc.removeBuildOptionsUserExtensions(title);\r
+ ffc.genBuildOptionsUserExtensions(title, outputFileName, vModInFv);\r
+ \r
+ docConsole.setSaved(false);\r
+ jTabbedPane.setSelectedIndex(0);\r
+ }\r
+ });\r
}\r
return jButtonOk;\r
}\r
projects / mirror_edk2.git / blobdiff