tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Store Variable Name as Hex data array in dynamic pcd build definitions. 

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1205 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
jlin16 2006-08-07 09:55:27 +00:00
parent fbea738a07
commit 2a23019dfd
2 changed files with 37 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
View File

@ -3,6 +3,7 @@ package org.tianocore.frameworkwizard.platform.ui;
import java.awt.BorderLayout; import java.awt.BorderLayout;
import javax.swing.ButtonGroup; import javax.swing.ButtonGroup;
import javax.swing.JOptionPane;
import javax.swing.JPanel; import javax.swing.JPanel;
import javax.swing.JScrollPane; import javax.swing.JScrollPane;
import javax.swing.JTable; import javax.swing.JTable;
@ -12,6 +13,8 @@ import javax.swing.event.ListSelectionListener;
import javax.swing.table.DefaultTableModel; import javax.swing.table.DefaultTableModel;
import org.tianocore.PlatformSurfaceAreaDocument; import org.tianocore.PlatformSurfaceAreaDocument;
import org.tianocore.frameworkwizard.common.DataValidation;
import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType; import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;
import org.tianocore.frameworkwizard.common.ui.IInternalFrame; import org.tianocore.frameworkwizard.common.ui.IInternalFrame;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
@ -244,7 +247,10 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
jRadioButtonHii.setSelected(true); jRadioButtonHii.setSelected(true);
String[][] saa = new String[ffc.getDynamicPcdSkuInfoCount(i)][7]; String[][] saa = new String[ffc.getDynamicPcdSkuInfoCount(i)][7];
ffc.getDynamicPcdSkuInfos(i, saa); ffc.getDynamicPcdSkuInfos(i, saa);
jTextFieldVarName.setText(saa[0][1]);
String varDisplayName = Tools.convertUnicodeHexStringToString(saa[0][1]);
jTextFieldVarName.setText(varDisplayName);
jTextFieldVarGuid.setText(saa[0][2]); jTextFieldVarGuid.setText(saa[0][2]);
jTextFieldVarOffset.setText(saa[0][3]); jTextFieldVarOffset.setText(saa[0][3]);
jTextFieldHiiDefaultValue.setText(saa[0][4]); jTextFieldHiiDefaultValue.setText(saa[0][4]);
@ -274,7 +280,8 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
else if (saa[i][1] != null) { else if (saa[i][1] != null) {
jRadioButtonHii.setSelected(true); jRadioButtonHii.setSelected(true);
jTextFieldVarName.setText(saa[i][1]); String varDisplayName = Tools.convertUnicodeHexStringToString(saa[i][1]);
jTextFieldVarName.setText(varDisplayName);
jTextFieldVarGuid.setText(saa[i][2]); jTextFieldVarGuid.setText(saa[i][2]);
jTextFieldVarOffset.setText(saa[i][3]); jTextFieldVarOffset.setText(saa[i][3]);
jTextFieldHiiDefaultValue.setText(saa[i][4]); jTextFieldHiiDefaultValue.setText(saa[i][4]);
@ -518,16 +525,40 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
String value = null; String value = null;
String vpdOffset = null; String vpdOffset = null;
if (jRadioButtonHii.isSelected()) { if (jRadioButtonHii.isSelected()) {
varName = jTextFieldVarName.getText(); varName = Tools.convertStringToUnicodeHexString(jTextFieldVarName.getText());
if (varName.length() == 0) {
JOptionPane.showMessageDialog(this, "Variable Name is Empty.");
return;
}
varGuid = jTextFieldVarGuid.getText(); varGuid = jTextFieldVarGuid.getText();
if (varGuid.length() == 0) {
JOptionPane.showMessageDialog(this, "Variable GUID is Empty.");
return;
}
varOffset = jTextFieldVarOffset.getText(); varOffset = jTextFieldVarOffset.getText();
if (!DataValidation.isHex64BitDataType(varOffset)) {
JOptionPane.showMessageDialog(this, "Variable Offset is NOT Hex64BitDataType.");
return;
}
hiiDefault = jTextFieldHiiDefaultValue.getText(); hiiDefault = jTextFieldHiiDefaultValue.getText();
if (!DataValidation.isDefaultValueType(hiiDefault)) {
JOptionPane.showMessageDialog(this, "Default Value is NOT DefaultValueType.");
return;
}
} }
if (jRadioButtonVpd.isSelected()) { if (jRadioButtonVpd.isSelected()) {
vpdOffset = jTextFieldVpdOffset.getText(); vpdOffset = jTextFieldVpdOffset.getText();
if (!DataValidation.isHex64BitDataType(vpdOffset)) {
JOptionPane.showMessageDialog(this, "VPD Offset is NOT Hex64BitDataType.");
return;
}
} }
if (jRadioButtonDefaultValue.isSelected()) { if (jRadioButtonDefaultValue.isSelected()) {
value = jTextFieldDefaultValue.getText(); value = jTextFieldDefaultValue.getText();
if (!DataValidation.isDefaultValueType(value)) {
JOptionPane.showMessageDialog(this, "Value is NOT DefaultValueType.");
return;
}
} }
// //
// SKU disabled. only modify data for default SKU. // SKU disabled. only modify data for default SKU.

4
Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java
View File

@ -791,7 +791,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
selectedInstancesTableModel.addColumn("PackageVersion"); selectedInstancesTableModel.addColumn("PackageVersion");
jTableSelectedInstances = new JTable(selectedInstancesTableModel); jTableSelectedInstances = new JTable(selectedInstancesTableModel);
jTableSelectedInstances.setRowHeight(20); jTableSelectedInstances.setRowHeight(20);
jTableSelectedInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF); jTableSelectedInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
jTableSelectedInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); jTableSelectedInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
} }
@ -896,7 +896,7 @@ public class FpdModuleSA extends JDialog implements ActionListener {
libInstanceTableModel.addColumn("PackageVersion"); libInstanceTableModel.addColumn("PackageVersion");
jTableLibInstances = new JTable(libInstanceTableModel); jTableLibInstances = new JTable(libInstanceTableModel);
jTableLibInstances.setRowHeight(20); jTableLibInstances.setRowHeight(20);
jTableLibInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF); jTableLibInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);
jTableLibInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); jTableLibInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
} }