2. Add GuidType UI support to protocol and ppi declarations according to latest schema.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1081
6f19259b-4bc3-4df7-8a09-
765794883524
}\r
\r
public void updateSpdPpiDecl(int i, String name, String cName, String guid, String hlp, String archList, \r
}\r
\r
public void updateSpdPpiDecl(int i, String name, String cName, String guid, String hlp, String archList, \r
+ String modTypeList, String guidTypeList){\r
XmlObject o = psaRoot.getPpiDeclarations();\r
if (o == null){\r
return;\r
XmlObject o = psaRoot.getPpiDeclarations();\r
if (o == null){\r
return;\r
e.setCName(cName);\r
e.setGuidValue(guid);\r
e.setHelpText(hlp);\r
e.setCName(cName);\r
e.setGuidValue(guid);\r
e.setHelpText(hlp);\r
+ if (stringToList(guidTypeList) != null) {\r
+ e.setGuidTypeList(stringToList(guidTypeList));\r
+ }\r
+ else{\r
+ if (e.isSetGuidTypeList()) {\r
+ e.unsetGuidTypeList();\r
+ }\r
+ }\r
if (stringToList(archList) != null){\r
e.setSupArchList(stringToList(archList));\r
}\r
if (stringToList(archList) != null){\r
e.setSupArchList(stringToList(archList));\r
}\r
}\r
\r
public void updateSpdProtocolDecl(int i, String name, String cName, String guid, String hlp, String archList, \r
}\r
\r
public void updateSpdProtocolDecl(int i, String name, String cName, String guid, String hlp, String archList, \r
+ String modTypeList, String guidTypeList){\r
XmlObject o = psaRoot.getProtocolDeclarations();\r
if (o == null){\r
return;\r
XmlObject o = psaRoot.getProtocolDeclarations();\r
if (o == null){\r
return;\r
e.setCName(cName);\r
e.setGuidValue(guid);\r
e.setHelpText(hlp);\r
e.setCName(cName);\r
e.setGuidValue(guid);\r
e.setHelpText(hlp);\r
+ if (stringToList(guidTypeList) != null) {\r
+ e.setGuidTypeList(stringToList(guidTypeList));\r
+ }\r
+ else{\r
+ if (e.isSetGuidTypeList()) {\r
+ e.unsetGuidTypeList();\r
+ }\r
+ }\r
if (stringToList(archList) != null){\r
e.setSupArchList(stringToList(archList));\r
}\r
if (stringToList(archList) != null){\r
e.setSupArchList(stringToList(archList));\r
}\r
protocol[i][3] = e.getHelpText();\r
protocol[i][4] = listToString(e.getSupArchList());\r
protocol[i][5] = listToString(e.getSupModuleList());\r
protocol[i][3] = e.getHelpText();\r
protocol[i][4] = listToString(e.getSupArchList());\r
protocol[i][5] = listToString(e.getSupModuleList());\r
+ protocol[i][6] = listToString(e.getGuidTypeList());\r
ppi[i][3] = e.getHelpText();\r
ppi[i][4] = listToString(e.getSupArchList());\r
ppi[i][5] = listToString(e.getSupModuleList());\r
ppi[i][3] = e.getHelpText();\r
ppi[i][4] = listToString(e.getSupArchList());\r
ppi[i][5] = listToString(e.getSupModuleList());\r
+ ppi[i][6] = listToString(e.getGuidTypeList());\r
**/\r
public void genSpdProtocolDeclarations(String protocolDeclEntryName, String protocolDeclCName,\r
String protocolDeclGuid, String protocolDeclFeatureFlag,\r
**/\r
public void genSpdProtocolDeclarations(String protocolDeclEntryName, String protocolDeclCName,\r
String protocolDeclGuid, String protocolDeclFeatureFlag,\r
- Vector<String> archList, Vector<String> modTypeList) {\r
+ Vector<String> archList, Vector<String> modTypeList, Vector<String> guidTypeList) {\r
if (getSpdProtocolDeclarations() == null) {\r
spdProtocolDeclarations = psaRoot.addNewProtocolDeclarations();\r
}\r
\r
setSpdEntry(protocolDeclEntryName, protocolDeclCName, protocolDeclGuid, protocolDeclFeatureFlag,\r
if (getSpdProtocolDeclarations() == null) {\r
spdProtocolDeclarations = psaRoot.addNewProtocolDeclarations();\r
}\r
\r
setSpdEntry(protocolDeclEntryName, protocolDeclCName, protocolDeclGuid, protocolDeclFeatureFlag,\r
- archList, modTypeList, null, spdProtocolDeclarations);\r
+ archList, modTypeList, guidTypeList, spdProtocolDeclarations);\r
@param ppiDeclFeatureFlag Reserved\r
**/\r
public void genSpdPpiDeclarations(String ppiDeclEntryName, String ppiDeclCName, String ppiDeclGuid,\r
@param ppiDeclFeatureFlag Reserved\r
**/\r
public void genSpdPpiDeclarations(String ppiDeclEntryName, String ppiDeclCName, String ppiDeclGuid,\r
- String ppiDeclFeatureFlag, Vector<String> archList, Vector<String> modTypeList) {\r
+ String ppiDeclFeatureFlag, Vector<String> archList, Vector<String> modTypeList, Vector<String> guidTypeList) {\r
if (getSpdPpiDeclarations() == null) {\r
spdPpiDeclarations = psaRoot.addNewPpiDeclarations();\r
}\r
\r
if (getSpdPpiDeclarations() == null) {\r
spdPpiDeclarations = psaRoot.addNewPpiDeclarations();\r
}\r
\r
- setSpdEntry(ppiDeclEntryName, ppiDeclCName, ppiDeclGuid, ppiDeclFeatureFlag, archList, modTypeList, null, spdPpiDeclarations);\r
+ setSpdEntry(ppiDeclEntryName, ppiDeclCName, ppiDeclGuid, ppiDeclFeatureFlag, archList, modTypeList, guidTypeList, spdPpiDeclarations);\r
pe.setCName(cName);\r
pe.setGuidValue(guid);\r
pe.setHelpText(help);\r
pe.setCName(cName);\r
pe.setGuidValue(guid);\r
pe.setHelpText(help);\r
+ if (guidTypeList != null) {\r
+ pe.setGuidTypeList(guidTypeList);\r
+ }\r
+ else{\r
+ if (pe.isSetGuidTypeList()) {\r
+ pe.unsetGuidTypeList();\r
+ }\r
+ }\r
if (archList != null) {\r
pe.setSupArchList(archList);\r
}\r
if (archList != null) {\r
pe.setSupArchList(archList);\r
}\r
ppe.setCName(cName);\r
ppe.setGuidValue(guid);\r
ppe.setHelpText(help);\r
ppe.setCName(cName);\r
ppe.setGuidValue(guid);\r
ppe.setHelpText(help);\r
+ if (guidTypeList != null) {\r
+ ppe.setGuidTypeList(guidTypeList);\r
+ }\r
+ else{\r
+ if (ppe.isSetGuidTypeList()) {\r
+ ppe.unsetGuidTypeList();\r
+ }\r
+ }\r
if (archList != null) {\r
ppe.setSupArchList(archList);\r
}\r
if (archList != null) {\r
ppe.setSupArchList(archList);\r
}\r
if (jScrollPane == null) {\r
jScrollPane = new JScrollPane();\r
jScrollPane.setBounds(new java.awt.Rectangle(12,351,608,253));\r
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
jScrollPane.setViewportView(getJTable());\r
}\r
return jScrollPane;\r
jButtonAdd = new JButton();\r
jButtonAdd.setText("Add");\r
jButtonAdd.setSize(new java.awt.Dimension(99,20));\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
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 = 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
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 = 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
jButtonRemoveAll.addActionListener(this);\r
}\r
return jButtonRemoveAll;\r
private JScrollPane getJContentPane(){\r
if (topScrollPane == null){\r
topScrollPane = new JScrollPane();\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
topScrollPane.setViewportView(getJContentPane1());\r
}\r
return topScrollPane;\r
jLabel3RecInstName.setText("Recommended Instance Name");\r
\r
jContentPane = new JPanel();\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.setLayout(null);\r
jContentPane.add(jLabelHdr, null);\r
jContentPane.add(jStarLabel1, null);\r
protected void initFrame() {\r
\r
this.setTitle("PPI Declarations");\r
protected void initFrame() {\r
\r
this.setTitle("PPI Declarations");\r
- getJScrollPaneGuid().setVisible(false);\r
- getJLabel3().setVisible(false);\r
- getJTable().getColumn("GuidTypes").setPreferredWidth(0);\r
- getJTable().getColumn("GuidTypes").setWidth(0);\r
- getJTable().getColumn("GuidTypes").setHeaderValue(" ");\r
}\r
\r
protected void init(SpdFileContents sfc){\r
}\r
\r
protected void init(SpdFileContents sfc){\r
if (sfc.getSpdPpiDeclarationCount() == 0) {\r
return ;\r
}\r
if (sfc.getSpdPpiDeclarationCount() == 0) {\r
return ;\r
}\r
- String[][] saa = new String[sfc.getSpdPpiDeclarationCount()][6];\r
+ String[][] saa = new String[sfc.getSpdPpiDeclarationCount()][7];\r
sfc.getSpdPpiDeclarations(saa);\r
int i = 0;\r
while (i < saa.length) {\r
sfc.getSpdPpiDeclarations(saa);\r
int i = 0;\r
while (i < saa.length) {\r
if (m.getValueAt(row, 5) != null) {\r
modTypeList = m.getValueAt(row, 5).toString();\r
}\r
if (m.getValueAt(row, 5) != null) {\r
modTypeList = m.getValueAt(row, 5).toString();\r
}\r
+ String guidTypeList = null;\r
+ if (m.getValueAt(row, 6) != null) {\r
+ guidTypeList = m.getValueAt(row, 6).toString();\r
+ }\r
String[] rowData = {name, cName, guid, help};\r
if (!dataValidation(rowData)){\r
return;\r
}\r
docConsole.setSaved(false);\r
String[] rowData = {name, cName, guid, help};\r
if (!dataValidation(rowData)){\r
return;\r
}\r
docConsole.setSaved(false);\r
- sfc.updateSpdPpiDecl(row, name, cName, guid, help, archList, modTypeList);\r
+ sfc.updateSpdPpiDecl(row, name, cName, guid, help, archList, modTypeList, guidTypeList);\r
}\r
\r
protected void addRow(String[] row) {\r
}\r
\r
protected void addRow(String[] row) {\r
return;\r
}\r
docConsole.setSaved(false);\r
return;\r
}\r
docConsole.setSaved(false);\r
- sfc.genSpdPpiDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]));\r
+ sfc.genSpdPpiDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]), stringToVector(row[6]));\r
}\r
\r
protected void removeRow(int i){\r
}\r
\r
protected void removeRow(int i){\r
protected void initFrame() {\r
\r
this.setTitle("Protocol Declarations");\r
protected void initFrame() {\r
\r
this.setTitle("Protocol Declarations");\r
- getJScrollPaneGuid().setVisible(false);\r
- getJLabel3().setVisible(false);\r
- getJTable().getColumn("GuidTypes").setPreferredWidth(0);\r
- getJTable().getColumn("GuidTypes").setWidth(0);\r
- getJTable().getColumn("GuidTypes").setHeaderValue(" ");\r
}\r
\r
protected void init(SpdFileContents sfc){\r
}\r
\r
protected void init(SpdFileContents sfc){\r
if (sfc.getSpdProtocolDeclarationCount() == 0) {\r
return ;\r
}\r
if (sfc.getSpdProtocolDeclarationCount() == 0) {\r
return ;\r
}\r
- String[][] saa = new String[sfc.getSpdProtocolDeclarationCount()][6];\r
+ String[][] saa = new String[sfc.getSpdProtocolDeclarationCount()][7];\r
sfc.getSpdProtocolDeclarations(saa);\r
int i = 0;\r
while (i < saa.length) {\r
sfc.getSpdProtocolDeclarations(saa);\r
int i = 0;\r
while (i < saa.length) {\r
if (m.getValueAt(row, 5) != null) {\r
modTypeList = m.getValueAt(row, 5).toString();\r
}\r
if (m.getValueAt(row, 5) != null) {\r
modTypeList = m.getValueAt(row, 5).toString();\r
}\r
+ String guidTypeList = null;\r
+ if (m.getValueAt(row, 6) != null) {\r
+ guidTypeList = m.getValueAt(row, 6).toString();\r
+ }\r
String[] rowData = {name, cName, guid, help};\r
if (!dataValidation(rowData)){\r
return;\r
}\r
docConsole.setSaved(false);\r
String[] rowData = {name, cName, guid, help};\r
if (!dataValidation(rowData)){\r
return;\r
}\r
docConsole.setSaved(false);\r
- sfc.updateSpdProtocolDecl(row, name, cName, guid, help, archList, modTypeList);\r
+ sfc.updateSpdProtocolDecl(row, name, cName, guid, help, archList, modTypeList, guidTypeList);\r
}\r
\r
protected void addRow(String[] row) {\r
}\r
\r
protected void addRow(String[] row) {\r
return;\r
}\r
docConsole.setSaved(false);\r
return;\r
}\r
docConsole.setSaved(false);\r
- sfc.genSpdProtocolDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]));\r
+ sfc.genSpdProtocolDeclarations(row[0], row[1], row[2], row[3], stringToVector(row[4]), stringToVector(row[5]), stringToVector(row[6]));\r
}\r
\r
protected void removeRow(int i){\r
}\r
\r
protected void removeRow(int i){\r