1. Fix EDKT418: Some buttons are not displayed correctly in Linux and MAC OS X operating system

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

16 files changed, 92 insertions, 92 deletions

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
index daf00ee80f..9d50d08f28 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
@@ -161,9 +161,9 @@ public class DataType {
 

     public static final int SPACE_TO_RIGHT_FOR_OK_BUTTON = 10;

 

-    public static final int SPACE_TO_RIGHT_FOR_ADD_BUTTON = 180;

+    public static final int SPACE_TO_RIGHT_FOR_ADD_BUTTON = 200;

 

-    public static final int SPACE_TO_RIGHT_FOR_REMOVE_BUTTON = 95;

+    public static final int SPACE_TO_RIGHT_FOR_REMOVE_BUTTON = 105;

 

     public static final int SPACE_TO_RIGHT_FOR_UPDATE_BUTTON = 10;

 

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
index 7cde681786..fbb8e46cec 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleBootModes.java
@@ -102,10 +102,10 @@ public class ModuleBootModes extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(210, 195, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -119,10 +119,10 @@ public class ModuleBootModes extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(390, 195, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -136,8 +136,8 @@ public class ModuleBootModes extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
index 94999d0ce3..e0821e7435 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDataHubs.java
@@ -101,10 +101,10 @@ public class ModuleDataHubs extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -118,10 +118,10 @@ public class ModuleDataHubs extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -135,8 +135,8 @@ public class ModuleDataHubs extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
index 7db1d9763b..0fd3659e82 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleEvents.java
@@ -106,10 +106,10 @@ public class ModuleEvents extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -123,10 +123,10 @@ public class ModuleEvents extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -140,8 +140,8 @@ public class ModuleEvents extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
index d35bbafa59..a2a334aeb8 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleExterns.java
@@ -101,10 +101,10 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -118,10 +118,10 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -135,8 +135,8 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
index d55ba0fb39..066de78d0d 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleGuids.java
@@ -98,10 +98,10 @@ public class ModuleGuids extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -115,10 +115,10 @@ public class ModuleGuids extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -132,8 +132,8 @@ public class ModuleGuids extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
index 0c1126c848..ed05598df9 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHiiPackages.java
@@ -98,10 +98,10 @@ public class ModuleHiiPackages extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -115,10 +115,10 @@ public class ModuleHiiPackages extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -132,8 +132,8 @@ public class ModuleHiiPackages extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
index 0dca57cf6c..5a4dd2b773 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleHobs.java
@@ -100,10 +100,10 @@ public class ModuleHobs extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -117,10 +117,10 @@ public class ModuleHobs extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -134,8 +134,8 @@ public class ModuleHobs extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
index 4a32ab9880..7d05abe5ba 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleLibraryClassDefinitions.java
@@ -96,8 +96,8 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 330, 80, 20));

-            jButtonAdd.setPreferredSize(new Dimension(80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 330, 90, 20));

+            jButtonAdd.setPreferredSize(new Dimension(90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

         }

@@ -113,9 +113,9 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 330, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 330, 90, 20));

             jButtonRemove.setText("Remove");

-            jButtonRemove.setPreferredSize(new Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new Dimension(90, 20));

             jButtonRemove.addActionListener(this);

         }

         return jButtonRemove;

@@ -130,9 +130,9 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 330, 80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 330, 90, 20));

             jButtonUpdate.setText("Edit");

-            jButtonUpdate.setPreferredSize(new Dimension(80, 20));

+            jButtonUpdate.setPreferredSize(new Dimension(90, 20));

             jButtonUpdate.addActionListener(this);

         }

         return jButtonUpdate;

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
index 0c3b2fd660..9f119a71f4 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePCDs.java
@@ -101,10 +101,10 @@ public class ModulePCDs extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 245, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 245, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -118,10 +118,10 @@ public class ModulePCDs extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 245, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 245, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -135,8 +135,8 @@ public class ModulePCDs extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 245, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 245, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
index 4b08c65c11..b82be702c1 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePackageDependencies.java
@@ -104,10 +104,10 @@ public class ModulePackageDependencies extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 445, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 445, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -121,10 +121,10 @@ public class ModulePackageDependencies extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 445, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 445, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -138,8 +138,8 @@ public class ModulePackageDependencies extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 445, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 445, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
index ce817642ef..ea4b125064 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModulePpis.java
@@ -104,10 +104,10 @@ public class ModulePpis extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -121,10 +121,10 @@ public class ModulePpis extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -138,8 +138,8 @@ public class ModulePpis extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
index b0cdc12330..a02ce38caa 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleProtocols.java
@@ -106,10 +106,10 @@ public class ModuleProtocols extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -123,10 +123,10 @@ public class ModuleProtocols extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -140,8 +140,8 @@ public class ModuleProtocols extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
index 36049b3d81..5a0747d9e6 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
@@ -98,10 +98,10 @@ public class ModuleSourceFiles extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -115,10 +115,10 @@ public class ModuleSourceFiles extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -132,8 +132,8 @@ public class ModuleSourceFiles extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
index f3fab22c23..46a336a075 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSystemTables.java
@@ -100,10 +100,10 @@ public class ModuleSystemTables extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 195, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -117,10 +117,10 @@ public class ModuleSystemTables extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 195, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -134,8 +134,8 @@ public class ModuleSystemTables extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 195, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
index 0da492202c..7711c2f0fc 100644
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
@@ -99,10 +99,10 @@ public class ModuleVariables extends IInternalFrame {
     private JButton getJButtonAdd() {

         if (jButtonAdd == null) {

             jButtonAdd = new JButton();

-            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 80, 20));

+            jButtonAdd.setBounds(new java.awt.Rectangle(230, 220, 90, 20));

             jButtonAdd.setText("Add");

             jButtonAdd.addActionListener(this);

-            jButtonAdd.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonAdd.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonAdd;

     }

@@ -116,10 +116,10 @@ public class ModuleVariables extends IInternalFrame {
     private JButton getJButtonRemove() {

         if (jButtonRemove == null) {

             jButtonRemove = new JButton();

-            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 80, 20));

+            jButtonRemove.setBounds(new java.awt.Rectangle(400, 220, 90, 20));

             jButtonRemove.setText("Remove");

             jButtonRemove.addActionListener(this);

-            jButtonRemove.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonRemove.setPreferredSize(new java.awt.Dimension(90, 20));

         }

         return jButtonRemove;

     }

@@ -133,8 +133,8 @@ public class ModuleVariables extends IInternalFrame {
     private JButton getJButtonUpdate() {

         if (jButtonUpdate == null) {

             jButtonUpdate = new JButton();

-            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 80, 20));

-            jButtonUpdate.setPreferredSize(new java.awt.Dimension(80, 20));

+            jButtonUpdate.setBounds(new java.awt.Rectangle(315, 220, 90, 20));

+            jButtonUpdate.setPreferredSize(new java.awt.Dimension(90, 20));

             jButtonUpdate.setText("Edit");

             jButtonUpdate.addActionListener(this);

         }