do not generate version attributes when saving module order information in FV if...

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1606 6f19259b-4bc3-4df7-8a09-765794883524

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 840f3e7700c5276faf3aac1ea7b6443ad7dcae55..6ca15710c291dc6b05879f6fad3fb533bf5c1f8c 100644 (file)
--- 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) {\r
             cursor.beginElement(elementModule);\r
             cursor.insertAttributeWithValue("ModuleGuid", includeModules.get(i)[0]);\r
-            cursor.insertAttributeWithValue("ModuleVersion", includeModules.get(i)[1]);\r
+            if (!includeModules.get(i)[1].equals("null") && includeModules.get(i)[1].length() != 0) {\r
+                cursor.insertAttributeWithValue("ModuleVersion", includeModules.get(i)[1]);\r
+            }\r
             cursor.insertAttributeWithValue("PackageGuid", includeModules.get(i)[2]);\r
-            cursor.insertAttributeWithValue("PackageVersion", includeModules.get(i)[3]);\r
+            if (!includeModules.get(i)[3].equals("null") && includeModules.get(i)[3].length() != 0) {\r
+                cursor.insertAttributeWithValue("PackageVersion", includeModules.get(i)[3]);\r
+            }\r
+            \r
             cursor.insertAttributeWithValue("Arch", includeModules.get(i)[4]);\r
             cursor.toEndToken();\r
             cursor.toNextToken();\r

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 869b3b608531dfbd73d5cbd224b34d817fc78db9..e97004c3ca03877765d277320987b0c6440869b9 100644 (file)
--- 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() {\r
             if (jButtonInsert == null) {\r
                 jButtonInsert = new JButton();\r
-                jButtonInsert.setText("<<");\r
+                jButtonInsert.setText("<");\r
                 jButtonInsert.setPreferredSize(new java.awt.Dimension(60,20));\r
                 jButtonInsert.addActionListener(new java.awt.event.ActionListener() {\r
                     public void actionPerformed(java.awt.event.ActionEvent e) {\r
@@ -2888,7 +2888,7 @@ public class FpdFlash extends IInternalFrame {
             if (jButtonRemove == null) {\r
                 jButtonRemove = new JButton();\r
                 jButtonRemove.setPreferredSize(new java.awt.Dimension(60,20));\r
-                jButtonRemove.setText(">>");\r
+                jButtonRemove.setText(">");\r
                 jButtonRemove.addActionListener(new java.awt.event.ActionListener() {\r
                     public void actionPerformed(java.awt.event.ActionEvent e) {\r
                         int selectedRowLeft = jTableModInFv.getSelectedRow();\r