diff options
| author | jlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-25 08:18:26 +0000 |
|---|---|---|
| committer | jlin16 <jlin16@6f19259b-4bc3-4df7-8a09-765794883524> | 2006-09-25 08:18:26 +0000 |
| commit | 5342724213d3797764f4deddcaf5677d7340b23a (patch) | |
| tree | 8559b9cc22c2fc9ca5008aaa3192cf2ec93fd1fd | |
| parent | bb511931b16d173f20394f19d2b87bd7dbde3182 (diff) | |
| download | edk2-platforms-5342724213d3797764f4deddcaf5677d7340b23a.tar.xz | |
do not generate version attributes when saving module order information in FV if no version data provided in ModuleSA or original BuildOptions->UserExtensions.
git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1606 6f19259b-4bc3-4df7-8a09-765794883524
2 files changed, 9 insertions, 4 deletions
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java index 840f3e7700..6ca15710c2 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java @@ -1761,9 +1761,14 @@ public class FpdFileContents { for (int i = 0; i < includeModules.size(); ++i) {
cursor.beginElement(elementModule);
cursor.insertAttributeWithValue("ModuleGuid", includeModules.get(i)[0]);
- cursor.insertAttributeWithValue("ModuleVersion", includeModules.get(i)[1]);
+ if (!includeModules.get(i)[1].equals("null") && includeModules.get(i)[1].length() != 0) {
+ cursor.insertAttributeWithValue("ModuleVersion", includeModules.get(i)[1]);
+ }
cursor.insertAttributeWithValue("PackageGuid", includeModules.get(i)[2]);
- cursor.insertAttributeWithValue("PackageVersion", includeModules.get(i)[3]);
+ if (!includeModules.get(i)[3].equals("null") && includeModules.get(i)[3].length() != 0) {
+ cursor.insertAttributeWithValue("PackageVersion", includeModules.get(i)[3]);
+ }
+
cursor.insertAttributeWithValue("Arch", includeModules.get(i)[4]);
cursor.toEndToken();
cursor.toNextToken();
diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java index 869b3b6085..e97004c3ca 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java @@ -2842,7 +2842,7 @@ public class FpdFlash extends IInternalFrame { private JButton getJButtonInsert() {
if (jButtonInsert == null) {
jButtonInsert = new JButton();
- jButtonInsert.setText("<<");
+ jButtonInsert.setText("<");
jButtonInsert.setPreferredSize(new java.awt.Dimension(60,20));
jButtonInsert.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
@@ -2888,7 +2888,7 @@ public class FpdFlash extends IInternalFrame { if (jButtonRemove == null) {
jButtonRemove = new JButton();
jButtonRemove.setPreferredSize(new java.awt.Dimension(60,20));
- jButtonRemove.setText(">>");
+ jButtonRemove.setText(">");
jButtonRemove.addActionListener(new java.awt.event.ActionListener() {
public void actionPerformed(java.awt.event.ActionEvent e) {
int selectedRowLeft = jTableModInFv.getSelectedRow();
|