import java.awt.event.ComponentEvent;\r
import java.io.File;\r
import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.Set;\r
+//import java.util.Iterator;\r
+//import java.util.Set;\r
import java.util.Vector;\r
\r
import javax.swing.AbstractAction;\r
import javax.swing.event.TableModelEvent;\r
import javax.swing.event.TableModelListener;\r
import javax.swing.table.DefaultTableModel;\r
+import javax.swing.table.TableColumn;\r
import javax.swing.table.TableModel;\r
import org.tianocore.PackageSurfaceAreaDocument;\r
import org.tianocore.frameworkwizard.common.DataType;\r
import org.tianocore.frameworkwizard.common.DataValidation;\r
-import org.tianocore.frameworkwizard.common.GlobalData;\r
+//import org.tianocore.frameworkwizard.common.GlobalData;\r
import org.tianocore.frameworkwizard.common.Tools;\r
import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r
import org.tianocore.frameworkwizard.platform.ui.LongTextEditor;\r
-import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
-import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
+//import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
+//import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
\r
\r
/**\r
\r
private JScrollPane jHelpTextScrollPane = null;\r
\r
- private JLabel jLabel3RecInstName = null;\r
-\r
- private JTextField jTextField1RecInstName = null;\r
-\r
- private JLabel jLabel4RecInstVer = null;\r
-\r
- private JTextField jTextField2RecInstVer = null;\r
-\r
private JLabel jLabel5SupArchList = null;\r
\r
private JLabel jLabel6SupModList = null;\r
\r
private ICheckBoxList iCheckBoxListArch = null;\r
\r
- private JComboBox jComboBox = null;\r
-\r
private int cnClassName = 0;\r
private int cnHdrFile = 1;\r
private int cnHelpText = 2;\r
- private int cnRecInstName = 3;\r
- private int cnRecInstVer = 4;\r
+// private int cnRecInstName = 3;\r
+// private int cnRecInstVer = 4;\r
private int cnSupArch = 5;\r
private int cnSupMod = 6;\r
+ \r
+ private final int classNameMinWidth = 200;\r
+ private final int hdrFileMinWidth = 300;\r
+ private final int helpTextMinWidth = 300;\r
+ private final int supArchMinWidth = 200;\r
+ private final int supModMinWidth = 200;\r
\r
private final int shortLabel = 90;\r
private final int longLabel = 220;\r
\r
jTable.getColumnModel().getColumn(cnHelpText).setCellEditor(new LongTextEditor());\r
\r
+ jTable.removeColumn(jTable.getColumnModel().getColumn(3));\r
+ jTable.removeColumn(jTable.getColumnModel().getColumn(3));\r
+ \r
Vector<String> vArch = new Vector<String>();\r
vArch.add("IA32");\r
vArch.add("X64");\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 - 2).setCellEditor(new ListEditor(vArch));\r
\r
Vector<String> vModule = new Vector<String>();\r
vModule.add("BASE");\r
vModule.add("UEFI_APPLICATION");\r
vModule.add("USER_DEFINED");\r
\r
- jTable.getColumnModel().getColumn(cnSupMod).setCellEditor(new ListEditor(vModule));\r
- \r
+ jTable.getColumnModel().getColumn(cnSupMod - 2).setCellEditor(new ListEditor(vModule));\r
+ \r
+ TableColumn column = jTable.getColumnModel().getColumn(this.cnClassName);\r
+ column.setMinWidth(this.classNameMinWidth);\r
+ column = jTable.getColumnModel().getColumn(this.cnHdrFile);\r
+ column.setMinWidth(this.hdrFileMinWidth);\r
+ column = jTable.getColumnModel().getColumn(this.cnHelpText);\r
+ column.setMinWidth(this.helpTextMinWidth);\r
+ column = jTable.getColumnModel().getColumn(this.cnSupArch - 2);\r
+ column.setMinWidth(this.supArchMinWidth);\r
+ column = jTable.getColumnModel().getColumn(this.cnSupMod - 2);\r
+ column.setMinWidth(this.supModMinWidth);\r
+ \r
jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
public void valueChanged(ListSelectionEvent e) {\r
String hdr = m.getValueAt(row, cnHdrFile) + "";\r
String hlp = m.getValueAt(row, cnHelpText) + "";\r
String name = null;\r
- if (m.getValueAt(row, cnRecInstName) != null) {\r
- name = m.getValueAt(row, cnRecInstName).toString();\r
- } \r
- String ver = null;\r
- if (m.getValueAt(row, cnRecInstVer) != null){\r
- ver = m.getValueAt(row, cnRecInstVer).toString();\r
- }\r
+// if (m.getValueAt(row, cnRecInstName) != null) {\r
+// name = m.getValueAt(row, cnRecInstName).toString();\r
+// } \r
+// String ver = null;\r
+// if (m.getValueAt(row, cnRecInstVer) != null){\r
+// ver = m.getValueAt(row, cnRecInstVer).toString();\r
+// }\r
String arch = null;\r
if (m.getValueAt(row, cnSupArch) != null) {\r
arch = m.getValueAt(row, cnSupArch).toString();\r
if (m.getValueAt(row, cnSupMod) != null) {\r
module = m.getValueAt(row, cnSupMod).toString();\r
}\r
- String[] rowData = {lib, hdr, hlp, name, ver};\r
+ String[] rowData = {lib, hdr, hlp, name};\r
if (!dataValidation(rowData)) {\r
return;\r
}\r
\r
String guid = null;\r
- if (name != null && name.length() > 0) {\r
- getLibInstances(lib);\r
- guid = nameToGuid(name);\r
- if (guid == null){\r
- JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
- return;\r
- }\r
- }\r
+// if (name != null && name.length() > 0) {\r
+// getLibInstances(lib);\r
+// guid = nameToGuid(name);\r
+// if (guid == null){\r
+// JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
+// return;\r
+// }\r
+// }\r
\r
String[] sa = new String[7];\r
sfc.getSpdLibClassDeclaration(sa, row);\r
if (cellData == null) {\r
cellData = "";\r
}\r
- if (column == cnRecInstName) {\r
- if (guid == null) {\r
- if (sa[cnRecInstName] == null) {\r
- return;\r
- }\r
- }\r
- else {\r
- if (guid.equals(sa[cnRecInstName])) {\r
- return;\r
- }\r
- }\r
+// if (column == cnRecInstName) {\r
+// if (guid == null) {\r
+// if (sa[cnRecInstName] == null) {\r
+// return;\r
+// }\r
+// }\r
+// else {\r
+// if (guid.equals(sa[cnRecInstName])) {\r
+// return;\r
+// }\r
+// }\r
+// }\r
+ if (cellData.equals(sa[column])) {\r
+ return;\r
}\r
- else {\r
- if (cellData.equals(sa[column])) {\r
- return;\r
- }\r
- if (cellData.toString().length() == 0 && sa[column] == null) {\r
- return;\r
- }\r
+ if (cellData.toString().length() == 0 && sa[column] == null) {\r
+ return;\r
}\r
docConsole.setSaved(false);\r
- sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
+ sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, null, arch, module);\r
}\r
}\r
\r
sfc.getSpdLibClassDeclarations(saa);\r
int i = 0;\r
while (i < saa.length) {\r
- if (saa[i][3] != null && saa[i][3].length() > 0) {\r
- getLibInstances(saa[i][0]);\r
- saa[i][3] = guidToName(saa[i][3]);\r
- }\r
+// if (saa[i][3] != null && saa[i][3].length() > 0) {\r
+// getLibInstances(saa[i][0]);\r
+// saa[i][3] = guidToName(saa[i][3]);\r
+// }\r
\r
model.addRow(saa[i]);\r
i++;\r
row[cnClassName] = jTextFieldAddClass.getText();\r
row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/');\r
row[cnHelpText] = jTextAreaHelp.getText();\r
- row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
- row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
+// row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
+// row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
row[cnSupArch] = vectorToString(iCheckBoxListArch.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[cnClassName]);\r
- String recommendGuid = nameToGuid(row[cnRecInstName]);\r
- if (row[cnRecInstName].equals("null")) {\r
- row[cnRecInstName] = null;\r
- }\r
- else{\r
- if (recommendGuid == null) {\r
- JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
- return;\r
- }\r
- }\r
-\r
- sfc.genSpdLibClassDeclarations(row[cnClassName], recommendGuid, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, row[cnRecInstVer], null, row[cnSupMod]);\r
+// getLibInstances(row[cnClassName]);\r
+// String recommendGuid = nameToGuid(row[cnRecInstName]);\r
+// if (row[cnRecInstName].equals("null")) {\r
+// row[cnRecInstName] = null;\r
+// }\r
+// else{\r
+// if (recommendGuid == null) {\r
+// JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
+// return;\r
+// }\r
+// }\r
+\r
+ sfc.genSpdLibClassDeclarations(row[cnClassName], null, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, null, null, row[cnSupMod]);\r
model.addRow(row);\r
jTable.changeSelection(model.getRowCount()-1, 0, false, false);\r
docConsole.setSaved(false);\r
JOptionPane.showMessageDialog(frame, "Help Text must be entered!");\r
return false;\r
}\r
- if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {\r
- if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {\r
- JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with the Instance Name.");\r
- return false;\r
- }\r
- \r
- if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r
- JOptionPane.showMessageDialog(frame, "Recommended Instance Version does not match Version datatype.");\r
- return false;\r
- }\r
- }\r
+// if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {\r
+// if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {\r
+// JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with the Instance Name.");\r
+// return false;\r
+// }\r
+// \r
+// if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r
+// JOptionPane.showMessageDialog(frame, "Recommended Instance Version does not match Version datatype.");\r
+// return false;\r
+// }\r
+// }\r
return true;\r
}\r
/**\r
return iCheckBoxListArch;\r
}\r
\r
- private void getLibInstances(String libClass){\r
- libNameGuidMap.clear();\r
- try {\r
- Iterator ismi = GlobalData.vModuleList.iterator();\r
- while (ismi.hasNext()) {\r
- ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
- \r
- Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
- for (int i = 0; i < classProduced.size(); ++i) {\r
- if (classProduced.get(i).equals(libClass)) {\r
- libNameGuidMap.put(mi.getName(), mi.getGuid());\r
- }\r
- }\r
- }\r
- \r
- }\r
- catch(Exception e){\r
- JOptionPane.showMessageDialog(frame, "Search Instances Failed.");\r
- }\r
- \r
- }\r
-\r
- private String nameToGuid(String name) {\r
- String s = null;\r
- if (!libNameGuidMap.containsKey(name)) {\r
- return s;\r
- }\r
- \r
- s = libNameGuidMap.get(name);\r
- return s;\r
- }\r
+// private void getLibInstances(String libClass){\r
+// libNameGuidMap.clear();\r
+// try {\r
+// Iterator ismi = GlobalData.vModuleList.iterator();\r
+// while (ismi.hasNext()) {\r
+// ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
+// \r
+// Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
+// for (int i = 0; i < classProduced.size(); ++i) {\r
+// if (classProduced.get(i).equals(libClass)) {\r
+// libNameGuidMap.put(mi.getName(), mi.getGuid());\r
+// }\r
+// }\r
+// }\r
+// \r
+// }\r
+// catch(Exception e){\r
+// JOptionPane.showMessageDialog(frame, "Search Instances Failed.");\r
+// }\r
+// \r
+// }\r
+\r
+// private String nameToGuid(String name) {\r
+// String s = null;\r
+// if (!libNameGuidMap.containsKey(name)) {\r
+// return s;\r
+// }\r
+// \r
+// s = libNameGuidMap.get(name);\r
+// return s;\r
+// }\r
\r
- private String guidToName(String guid){\r
- String s = "";\r
- if (!libNameGuidMap.containsValue(guid)) {\r
- return s;\r
- }\r
- Set<String> key = libNameGuidMap.keySet();\r
- Iterator<String> is = key.iterator();\r
- while(is.hasNext()) {\r
- s = is.next();\r
- if (libNameGuidMap.get(s).equals(guid)) {\r
- break;\r
- }\r
- }\r
- return s;\r
- }\r
+// private String guidToName(String guid){\r
+// String s = "";\r
+// if (!libNameGuidMap.containsValue(guid)) {\r
+// return s;\r
+// }\r
+// Set<String> key = libNameGuidMap.keySet();\r
+// Iterator<String> is = key.iterator();\r
+// while(is.hasNext()) {\r
+// s = is.next();\r
+// if (libNameGuidMap.get(s).equals(guid)) {\r
+// break;\r
+// }\r
+// }\r
+// return s;\r
+// }\r
\r
}\r
\r
projects / mirror_edk2.git / blobdiff