1. Change ToolCode from text field to drop down list, and user can enter their customizing tool command.

2. Fix some coding style issue


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

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java

@@ -2599,10 +2599,12 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      
      **/
     private void doubleClickModuleTreeNode() {
-        Identification id = iTree.getSelectNode().getId();
+        Identification id = null;
-        int intCategory = iTree.getSelectCategory();
+        int intCategory = -1;
         String path = null;
         try {
+            id = iTree.getSelectNode().getId();
+            intCategory = iTree.getSelectCategory();
             //          
             // If the node is not opened yet
             // Insert top level elements first
@@ -2894,8 +2896,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                 try {
                     wt.addPackageToDatabase(smb.getPid());
                 } catch (Exception e) {
-                    // TODO Auto-generated catch block
+                    Log.err("addPackageToDatabase", e.getMessage());
-                    e.printStackTrace();
                 }
                 vPackageList.addElement(smb.getPid());
 
@@ -2932,8 +2933,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                 try {
                     wt.addPlatformToDatabase(smb.getFid());
                 } catch (Exception e) {
-                    // TODO Auto-generated catch block
+                    Log.err("addPlatformToDatabase", e.getMessage());
-                    e.printStackTrace();
                 }
                 vPlatformList.addElement(smb.getFid());
                 //

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java

@@ -84,6 +84,8 @@ public class EnumerationData {
     
     public Vector<String> vSourceFilesFileType = new Vector<String>();
     
+    public Vector<String> vToolCode = new Vector<String>();
+    
     //
     // Used by Package Dependencies
     //
@@ -203,6 +205,7 @@ public class EnumerationData {
         //
         initSourceFilesToolChainFamily();
         initSourceFilesFileType();
+        initToolCode();
         
         //
         // Used by Package Dependencies
@@ -491,6 +494,18 @@ public class EnumerationData {
         vSourceFilesFileType.addElement("EFI");
     }
     
+    private void initToolCode() {
+        vToolCode.removeAllElements();
+        vToolCode.addElement(DataType.EMPTY_SELECT_ITEM);
+        vToolCode.addElement("CC");
+        vToolCode.addElement("DLINK");
+        vToolCode.addElement("SLINK");
+        vToolCode.addElement("PP");
+        vToolCode.addElement("ASM");
+        vToolCode.addElement("ASMLINK");
+        vToolCode.addElement("ASL");
+    }
+    
     private void initPackageUsage() {
         vPackageUsage.removeAllElements();
         vPackageUsage.addElement("ALWAYS_CONSUMED");
@@ -1010,4 +1025,12 @@ public class EnumerationData {
     public void setVPackageUsage(Vector<String> packageUsage) {
         vPackageUsage = packageUsage;
     }
+
+    public Vector<String> getVToolCode() {
+        return vToolCode;
+    }
+
+    public void setVToolCode(Vector<String> toolCode) {
+        vToolCode = toolCode;
+    }
 }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/FileOperation.java

@@ -40,26 +40,8 @@ public class FileOperation {
      **/
     public static void newFolder(String folderPath) throws Exception {
         folderPath = Tools.convertPathToCurrentOsType(folderPath);
-        String temp = "";
+        File f = new File(folderPath);
-        while (folderPath.length() > 0) {
+        f.mkdirs();
-            if (folderPath.indexOf(DataType.FILE_SEPARATOR) > -1) {
-                temp = temp + folderPath.substring(0, folderPath.indexOf(DataType.FILE_SEPARATOR));
-                if (temp.endsWith(":")) {
-                    temp = Tools.addFileSeparator(temp);
-                    folderPath = folderPath.substring(folderPath.indexOf(DataType.FILE_SEPARATOR) + DataType.FILE_SEPARATOR.length());
-                    continue;
-                }
-                temp = Tools.addFileSeparator(temp);
-                folderPath = folderPath.substring(folderPath.indexOf(DataType.FILE_SEPARATOR) + DataType.FILE_SEPARATOR.length());    
-            } else {
-                temp = Tools.addFileSeparator(temp) + folderPath;
-                folderPath = "";
-            }
-            File f = new File(temp);
-            if (!f.exists()) {
-                f.mkdir();
-            }
-        }
     }
 
     /**

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java

@@ -320,7 +320,7 @@ public class Tools {
      
      **/
     public static void showInformationMessage(String arg0) {
-        JOptionPane.showConfirmDialog(null, arg0, "Error", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE);
+        JOptionPane.showConfirmDialog(null, arg0, "Info", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE);
     }
 
     /**

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IComboBox.java

@@ -92,7 +92,8 @@ public class IComboBox extends JComboBox implements KeyListener, MouseListener,
         this.addKeyListener(this);
         this.getEditor().getEditorComponent().addKeyListener(this);
         this.getEditor().getEditorComponent().addFocusListener(this);
-        this.setToolTipText("Double Click to add an entry and finished by press ENTER. Press DELETE can remove selected entry.");
+        this.setToolTipText("<html>Double Click to add an entry and finished by press ENTER. <br>"
+                            + "Press DELETE can remove selected entry.</html>");
     }
 
     public void keyPressed(KeyEvent arg0) {
@@ -122,6 +123,7 @@ public class IComboBox extends JComboBox implements KeyListener, MouseListener,
                 }
                 this.setEditable(false);
             }
+
             if (arg0.getKeyCode() == KeyEvent.VK_ESCAPE) {
                 closeEdit();
             }
@@ -160,7 +162,6 @@ public class IComboBox extends JComboBox implements KeyListener, MouseListener,
             this.setEditable(true);
             this.getEditor().setItem("");
         }
-
     }
 
     public void mouseEntered(MouseEvent arg0) {
@@ -190,8 +191,5 @@ public class IComboBox extends JComboBox implements KeyListener, MouseListener,
     private void closeEdit() {
         this.setEditable(false);
         this.getEditor().setItem("");
-        if (this.getItemCount() > 0) {
-            this.setSelectedIndex(0);
-        }
     }
 }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleDefinitions.java

@@ -136,12 +136,12 @@ public class ModuleDefinitions extends IInternalFrame {
         if (iCheckBoxListArch == null) {
             iCheckBoxListArch = new ICheckBoxList();
             iCheckBoxListArch.addFocusListener(this);
-            iCheckBoxListArch.setToolTipText("<html>Deselecting a checkbox will restrict this module<br>" +
+            iCheckBoxListArch.setToolTipText("<html>Deselecting a checkbox will restrict this module<br>"
-                    "for use with the selected architectures, <br>" +
+                                             + "for use with the selected architectures, <br>"
-                    "based on the list of items that are checked. <br>" +
+                                             + "based on the list of items that are checked. <br>"
-                    "If all boxes are checked, <br>" +
+                                             + "If all boxes are checked, <br>"
-                    "then the module will support all <br>" +
+                                             + "then the module will support all <br>"
-                    "current AND FUTURE architectures</html>");
+                                             + "current AND FUTURE architectures</html>");
         }
         return iCheckBoxListArch;
     }
@@ -157,14 +157,14 @@ public class ModuleDefinitions extends IInternalFrame {
             jComboBoxBinaryModule.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxBinaryModule.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxBinaryModule.addFocusListener(this);
-            jComboBoxBinaryModule.setToolTipText("<html>Modules are either source modules <br>" +
+            jComboBoxBinaryModule.setToolTipText("<html>Modules are either source modules <br>"
-                                                 "which can be compiled or binary <br>" +
+                                                 + "which can be compiled or binary <br>"
-                                                 "modules which are linked.  <br>" +
+                                                 + "modules which are linked.  <br>"
-                                                 "A module cannot contain both. <br>" +
+                                                 + "A module cannot contain both. <br>"
-                                                 "The GUID numbers should be identical <br>" +
+                                                 + "The GUID numbers should be identical <br>"
-                                                 "for a binary and source MSA, <br>" +
+                                                 + "for a binary and source MSA, <br>"
-                                                 "but the BINARY MSA should have <br>" +
+                                                 + "but the BINARY MSA should have <br>"
-                                                 "a higher version number.</html>");
+                                                 + "a higher version number.</html>");
         }
         return jComboBoxBinaryModule;
     }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java

@@ -348,7 +348,8 @@ public class ModuleSourceFiles extends IInternalFrame {
     }
 
     private void showEdit(int index) {
-        SourceFilesDlg sfd = new SourceFilesDlg(this.vSourceFiles.getSourceFiles(index), new IFrame(), omt.getId().getPath());
+        SourceFilesDlg sfd = new SourceFilesDlg(this.vSourceFiles.getSourceFiles(index), new IFrame(), omt.getId()
+                                                                                                          .getPath());
         int result = sfd.showDialog();
         if (result == DataType.RETURN_TYPE_OK) {
             if (index == -1) {

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/BootModesDlg.java

@@ -110,7 +110,17 @@ public class BootModesDlg extends IDialog {
             jComboBoxBootModeName = new JComboBox();
             jComboBoxBootModeName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
             jComboBoxBootModeName.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxBootModeName.setToolTipText("<html><table><tr><td>FULL</td><td>Boot with full configuration</td></tr><tr><td>MINIMAL</td><td>Boot with minimal configuration</td></tr><tr><td>NO_CHANGE</td><td>Boot assuming no configuration changes</td></tr><tr><td>DIAGNOSTICS</td><td>Boot with full configuration plus diagnostics</td></tr><tr><td>DEFAULT</td><td>Boot with default settings</td></tr><tr><td>BOOT_ON_S#_RESUME</td><td>where # is 2, 3, 4 or 5</td></tr><tr><td>FLASH_UPDATE</td><td>Boot on flash update</td></tr><tr><td>RECOVERY</td><td>Boot in recovery mode</td></tr></table></html>");
+            jComboBoxBootModeName
+                                 .setToolTipText("<html><table>"
+                                                 + "<tr><td>FULL</td><td>Boot with full configuration</td></tr>"
+                                                 + "<tr><td>MINIMAL</td><td>Boot with minimal configuration</td></tr>"
+                                                 + "<tr><td>NO_CHANGE</td><td>Boot assuming no configuration changes</td></tr>"
+                                                 + "<tr><td>DIAGNOSTICS</td><td>Boot with full configuration plus diagnostics</td></tr>"
+                                                 + "<tr><td>DEFAULT</td><td>Boot with default settings</td></tr>"
+                                                 + "<tr><td>BOOT_ON_S#_RESUME</td><td>where # is 2, 3, 4 or 5</td></tr>"
+                                                 + "<tr><td>FLASH_UPDATE</td><td>Boot on flash update</td></tr>"
+                                                 + "<tr><td>RECOVERY</td><td>Boot in recovery mode</td></tr>"
+                                                 + "</table></html>");
         }
         return jComboBoxBootModeName;
     }
@@ -126,7 +136,13 @@ public class BootModesDlg extends IDialog {
             jComboBoxUsage = new JComboBox();
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxUsage.setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Indicates Supports the specified boot mode</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Indicates Supports the specified boot mode on some execution paths</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Always changes the boot mode</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Change the boot mode sometimes</td></tr></table></html>");
+            jComboBoxUsage
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>Indicates Supports the specified boot mode</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>Indicates Supports the specified boot mode on some execution paths</td></tr>"
+                                          + "<tr><td>ALWAYS_PRODUCED</td><td>Always changes the boot mode</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Change the boot mode sometimes</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -139,8 +155,7 @@ public class BootModesDlg extends IDialog {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 105, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
             jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/DataHubsDlg.java

@@ -108,11 +108,9 @@ public class DataHubsDlg extends IDialog {
     private JTextField getJTextFieldDataHubRecord() {
         if (jTextFieldDataHubRecord == null) {
             jTextFieldDataHubRecord = new JTextField();
-      jTextFieldDataHubRecord
+            jTextFieldDataHubRecord.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 10, 320, 20));
             jTextFieldDataHubRecord.setPreferredSize(new java.awt.Dimension(320, 20));
-      jTextFieldDataHubRecord
+            jTextFieldDataHubRecord.setToolTipText("Enter the C Name of the Data Hub Record");
-          .setToolTipText("Enter the C Name of the Data Hub Record");
         }
         return jTextFieldDataHubRecord;
     }
@@ -129,7 +127,12 @@ public class DataHubsDlg extends IDialog {
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxUsage
-          .setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes a Data Hub Entry<br>via registering a filter driver.</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will use a Data Hub Entry if it exists<br>via registering a filter driver</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Always logs data into the Data Hub</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Log data into the Data Hub under<br>certain circumstances</td></tr></table></html>");
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>Module always consumes a Data Hub Entry<br>via registering a filter driver.</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>Module will use a Data Hub Entry if it exists<br>via registering a filter driver</td></tr>"
+                                          + "<tr><td>ALWAYS_PRODUCED</td><td>Always logs data into the Data Hub</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Log data into the Data Hub under<br>certain circumstances</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -188,12 +191,13 @@ public class DataHubsDlg extends IDialog {
             jScrollPaneHelpText = new JScrollPane();
             jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320,40));
+            jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setLocation(new java.awt.Point(160,60));
+            jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60));
             jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());
         }
         return jScrollPaneHelpText;
     }
+
     /**
      * This method initializes jButtonOk
      * 
@@ -270,8 +274,7 @@ public class DataHubsDlg extends IDialog {
      * @param iFrame
      * 
      */
-  public DataHubsDlg(DataHubsIdentification inDataHubsIdentification,
+    public DataHubsDlg(DataHubsIdentification inDataHubsIdentification, IFrame iFrame) {
-      IFrame iFrame) {
         super(iFrame, true);
         init(inDataHubsIdentification);
     }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/EventsDlg.java

@@ -121,7 +121,9 @@ public class EventsDlg extends IDialog {
             jComboBoxEventsType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
             jComboBoxEventsType.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxEventsType
-          .setToolTipText("<html>Select CreateEvents if the Module has an event that is waiting to be signaled.<br>Select SignalEvents if the Module will signal all events in an event group.<br>NOTE: Signal events are named by GUID.</html>");
+                               .setToolTipText("<html>Select CreateEvents if the Module has an event that is waiting to be signaled.<br>"
+                                               + "Select SignalEvents if the Module will signal all events in an event group.<br>"
+                                               + "NOTE: Signal events are named by GUID.</html>");
         }
         return jComboBoxEventsType;
     }
@@ -152,8 +154,7 @@ public class EventsDlg extends IDialog {
             jComboBoxEventGroup = new JComboBox();
             jComboBoxEventGroup.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
             jComboBoxEventGroup.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxEventGroup
+            jComboBoxEventGroup.setToolTipText("Select Type of Event: Guid or Timer.");
-          .setToolTipText("Select Type of Event: Guid or Timer.");
 
         }
         return jComboBoxEventGroup;
@@ -171,7 +172,15 @@ public class EventsDlg extends IDialog {
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxUsage
-          .setToolTipText("<html><table><tr><td colspan=2 align=center><b>Create Events</b></td></tr><tr><td>ALWAYS_CONSUMED</td><td>Module registers a notification function and REQUIRES that it be<br>executed for the module to fully function.</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module registers a notification function and calls the function<br>when it is signaled</td></tr><tr><td colspan=2 align=center><b>Signal Events</b></td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module will Always signal the event</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes signal the event</td></tr></table></html>");
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td colspan=2 align=center><b>Create Events</b></td></tr>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>Module registers a notification function and REQUIRES that it be<br>"
+                                          + "executed for the module to fully function.</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>Module registers a notification function and calls the function<br>"
+                                          + "when it is signaled</td></tr><tr><td colspan=2 align=center><b>Signal Events</b></td></tr>"
+                                          + "<tr><td>ALWAYS_PRODUCED</td><td>Module will Always signal the event</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes signal the event</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -197,11 +206,9 @@ public class EventsDlg extends IDialog {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 155, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 155, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
-          .setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
         return jTextFieldFeatureFlag;
     }
@@ -231,9 +238,9 @@ public class EventsDlg extends IDialog {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
             jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-      jScrollPaneHelpText.setSize(new java.awt.Dimension(320,40));
+            jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320,40));
+            jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setLocation(new java.awt.Point(160,110));
+            jScrollPaneHelpText.setLocation(new java.awt.Point(160, 110));
             jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());
         }
         return jScrollPaneHelpText;
@@ -421,8 +428,7 @@ public class EventsDlg extends IDialog {
         Tools.generateComboBoxByVector(jComboBoxEventsType, ed.getVEventType());
         Tools.generateComboBoxByVector(jComboBoxEventGroup, ed.getVEventGroup());
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVEventUsage());
-    Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt
+        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());
-        .getAllGuidDeclarationsFromWorkspace());
     }
 
     /*
@@ -469,8 +475,7 @@ public class EventsDlg extends IDialog {
         }
 
         if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {
-      if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name
+            if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {
-          .getSelectedItem().toString())) {
                 Log.wrn("Update Events", "Incorrect data type for Event Name");
                 return false;
             }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/GuidsDlg.java

@@ -122,7 +122,14 @@ public class GuidsDlg extends IDialog {
             jComboBoxUsage = new JComboBox();
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxUsage.setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the GUID</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will use the GUID only if it is present</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the GUID</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes produce the GUID</td></tr><tr><td>DEFAULT</td><td>Default is the the GUID that specified the<br>instance of the package</td></tr></table></html>");
+            jComboBoxUsage
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the GUID</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>Module will use the GUID only if it is present</td></tr>"
+                                          + "<tr><td>ALWAYS_PRODUCED</td><td>Module always produces the GUID</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Module will sometimes produce the GUID</td></tr>"
+                                          + "<tr><td>DEFAULT</td><td>Default is the the GUID that specified the<br>instance of the package</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -179,15 +186,16 @@ public class GuidsDlg extends IDialog {
      * 
      **/
     private JScrollPane getJScrollPaneHelpText() {
-    if (jScrollPaneHelpText == null){
+        if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
             jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setLocation(new java.awt.Point(160,60));
+            jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60));
             jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());
         }
         return jScrollPaneHelpText;
     }
+
     /**
      * This method initializes jButtonOk
      * 
@@ -346,8 +354,7 @@ public class GuidsDlg extends IDialog {
      * 
      */
     private void initFrame() {
-    Tools.generateComboBoxByVector(jComboBoxCName, wt
+        Tools.generateComboBoxByVector(jComboBoxCName, wt.getAllGuidDeclarationsFromWorkspace());
-        .getAllGuidDeclarationsFromWorkspace());
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVGuidUsage());
     }
 
@@ -390,8 +397,7 @@ public class GuidsDlg extends IDialog {
         // Check Name
         //
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {
-      if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem()
+            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {
-          .toString())) {
                 Log.wrn("Update Guids", "Incorrect data type for Guid Name");
                 return false;
             }
@@ -410,7 +416,7 @@ public class GuidsDlg extends IDialog {
         return true;
     }
 
-private GuidsIdentification getCurrentGuids() {
+    private GuidsIdentification getCurrentGuids() {
         String arg0 = this.jComboBoxCName.getSelectedItem().toString();
         String arg1 = this.jComboBoxUsage.getSelectedItem().toString();
 
@@ -420,7 +426,9 @@ private GuidsIdentification getCurrentGuids() {
 
         id = new GuidsIdentification(arg0, arg1, arg2, arg3, arg4);
         return id;
-    }  public GuidsIdentification getId() {
+    }
+
+    public GuidsIdentification getId() {
         return id;
     }
 

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HiiPackagesDlg.java

@@ -123,7 +123,10 @@ public class HiiPackagesDlg extends IDialog {
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxUsage
-          .setToolTipText("<html><table><tr><td>ALWAYS_PRODUCED</td><td>Hii is always registered</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Some executions paths will require the Hii to be registered</td></tr></table></html>");
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td>ALWAYS_PRODUCED</td><td>Hii is always registered</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Some executions paths will require the Hii to be registered</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -139,8 +142,7 @@ public class HiiPackagesDlg extends IDialog {
             jTextFieldFeatureFlag = new JTextField();
             jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 105, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
-          .setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
         return jTextFieldFeatureFlag;
     }
@@ -186,8 +188,7 @@ public class HiiPackagesDlg extends IDialog {
     private JScrollPane getJScrollPaneHelpText() {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
-      jScrollPaneHelpText
+            jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-          .setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60));
@@ -275,8 +276,7 @@ public class HiiPackagesDlg extends IDialog {
      * @param iFrame
      * 
      **/
-  public HiiPackagesDlg(HiiPackagesIdentification inHiiPackagesIdentification,
+    public HiiPackagesDlg(HiiPackagesIdentification inHiiPackagesIdentification, IFrame iFrame) {
-      IFrame iFrame) {
         super(iFrame, true);
         init(inHiiPackagesIdentification);
     }
@@ -404,15 +404,13 @@ public class HiiPackagesDlg extends IDialog {
         // Check Hii Package Name
         //
         if (isEmpty(this.jTextFieldName.getText())) {
-      Log.wrn("Update Hii Packages",
+            Log.wrn("Update Hii Packages", "Hii Package Name Record must not be empty");
-          "Hii Package Name Record must not be empty");
             return false;
         }
 
         if (!isEmpty(this.jTextFieldName.getText())) {
             if (!DataValidation.isC_NameType(this.jTextFieldName.getText())) {
-        Log.wrn("Update Hii Packages",
+                Log.wrn("Update Hii Packages", "Incorrect data type for Hii Package Name");
-            "Incorrect data type for Hii Package Name");
                 return false;
             }
         }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/HobsDlg.java

@@ -127,7 +127,17 @@ public class HobsDlg extends IDialog {
             jComboBoxHobType = new JComboBox();
             jComboBoxHobType.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxHobType.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxHobType.setToolTipText("<html><table><tr><td>PHIT</td><td>EFI_HOB_TYPE_HANDOFF</td></tr><tr><td>MEMORY_ALLOCATION</td><td>EFI_HOB_TYPE_MEMORY_ALLOCATION and $BaseName</td></tr><tr><td>RESOURCE_DESCRIPTOR</td><td>EFI_HOB_TYPE_RESOURCE_DESCRIPTOR</td></tr><tr><td>GUID_EXTENTION</td><td>EFI_HOB_TYPE_GUID_EXTENSION and BaseName of GUID</td></tr><tr><td>FIRMWARE_VOLUME</td><td>EFI_HOB_TYPE_FV</td></tr><tr><td>CPU</td><td>EFI_HOB_TYPE_CPU</td></tr><tr><td>POOL</td><td>EFI_HOB_TYPE_PEI_MEMORY_POOL</td></tr><tr><td>CAPSULE_VOLUME</td><td>EFI_HOB_TYPE_CV</td></tr></table></html>");
+            jComboBoxHobType
+                            .setToolTipText("<html><table>"
+                                            + "<tr><td>PHIT</td><td>EFI_HOB_TYPE_HANDOFF</td></tr>"
+                                            + "<tr><td>MEMORY_ALLOCATION</td><td>EFI_HOB_TYPE_MEMORY_ALLOCATION and $BaseName</td></tr>"
+                                            + "<tr><td>RESOURCE_DESCRIPTOR</td><td>EFI_HOB_TYPE_RESOURCE_DESCRIPTOR</td></tr>"
+                                            + "<tr><td>GUID_EXTENTION</td><td>EFI_HOB_TYPE_GUID_EXTENSION and BaseName of GUID</td></tr>"
+                                            + "<tr><td>FIRMWARE_VOLUME</td><td>EFI_HOB_TYPE_FV</td></tr>"
+                                            + "<tr><td>CPU</td><td>EFI_HOB_TYPE_CPU</td></tr>"
+                                            + "<tr><td>POOL</td><td>EFI_HOB_TYPE_PEI_MEMORY_POOL</td></tr>"
+                                            + "<tr><td>CAPSULE_VOLUME</td><td>EFI_HOB_TYPE_CV</td></tr>"
+                                            + "</table></html>");
         }
         return jComboBoxHobType;
     }
@@ -143,7 +153,13 @@ public class HobsDlg extends IDialog {
             jComboBoxUsage = new JComboBox();
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxUsage.setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>HOB must be present in the system</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>HOB will be used if it's present</td></tr><tr><td>ALWAYS_PRODUCED</td><td>HOB is always produced</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>HOB will sometimes be produced by the module</td></tr></table></html>");
+            jComboBoxUsage
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>HOB must be present in the system</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>HOB will be used if it's present</td></tr>"
+                                          + "<tr><td>ALWAYS_PRODUCED</td><td>HOB is always produced</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>HOB will sometimes be produced by the module</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -169,8 +185,7 @@ public class HobsDlg extends IDialog {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 130, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
             jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
@@ -200,8 +215,7 @@ public class HobsDlg extends IDialog {
     private JScrollPane getJScrollPaneHelpText() {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
-      jScrollPaneHelpText
+            jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-          .setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));
@@ -380,8 +394,7 @@ public class HobsDlg extends IDialog {
     private void initFrame() {
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVHobUsage());
         Tools.generateComboBoxByVector(jComboBoxHobType, ed.getVHobType());
-    Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt
+        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());
-        .getAllGuidDeclarationsFromWorkspace());
     }
 
     /*
@@ -428,8 +441,7 @@ public class HobsDlg extends IDialog {
         }
 
         if (!isEmpty(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {
-      if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name
+            if (!DataValidation.isC_NameType(this.jComboBoxGuidC_Name.getSelectedItem().toString())) {
-          .getSelectedItem().toString())) {
                 Log.wrn("Update Hobs", "Incorrect data type for Hob Name");
                 return false;
             }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/LibraryClassDefsDlg.java

@@ -212,6 +212,7 @@ public class LibraryClassDefsDlg extends IDialog {
             jTextFieldFeatureFlag = new JTextField();
             jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
+            jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
         return jTextFieldFeatureFlag;
     }
@@ -372,7 +373,7 @@ public class LibraryClassDefsDlg extends IDialog {
             jLabelArch.setText("Supported Architectures");
             jLabelFeatureFlag = new JLabel();
             jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 85, 140, 20));
-            jLabelFeatureFlag.setText("Feature Flag");
+            jLabelFeatureFlag.setText("Feature Flag Expression");
             jLabelRecommendedInstanceGuid = new JLabel();
             jLabelRecommendedInstanceGuid.setBounds(new java.awt.Rectangle(15, 110, 200, 20));
             jLabelRecommendedInstanceGuid.setText("Recommended Instance Guid");

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java

@@ -147,8 +147,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldDefaultValue() {
         if (jTextFieldDefaultValue == null) {
             jTextFieldDefaultValue = new JTextField();
-      jTextFieldDefaultValue
+            jTextFieldDefaultValue.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 60, 320, 20));
             jTextFieldDefaultValue.setPreferredSize(new java.awt.Dimension(320, 20));
         }
         return jTextFieldDefaultValue;
@@ -177,8 +176,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JScrollPane getJScrollPaneHelpText() {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
-      jScrollPaneHelpText
+            jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-          .setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));
@@ -208,10 +206,8 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldTokenSpaceGuid() {
         if (jTextFieldTokenSpaceGuid == null) {
             jTextFieldTokenSpaceGuid = new JTextField();
-      jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(160, 60, 320,
+            jTextFieldTokenSpaceGuid.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
-          20));
+            jTextFieldTokenSpaceGuid.setPreferredSize(new java.awt.Dimension(320, 20));
-      jTextFieldTokenSpaceGuid
-          .setPreferredSize(new java.awt.Dimension(320, 20));
             jTextFieldTokenSpaceGuid.setVisible(false);
         }
         return jTextFieldTokenSpaceGuid;
@@ -225,8 +221,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 130, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
             jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
@@ -418,7 +413,6 @@ public class PCDsDlg extends IDialog implements ItemListener {
         // Tools.generateComboBoxByVector(jComboBoxItemType, ed.getVPcdItemTypes());
     }
 
-  
     /*
      * (non-Javadoc)
      * 
@@ -458,8 +452,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         // Check C_Name
         //
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {
-      if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem()
+            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {
-          .toString())) {
                 Log.wrn("Update PcdCoded", "Incorrect data type for C Name");
                 return false;
             }
@@ -470,8 +463,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //
         if (!isEmpty(this.jTextFieldTokenSpaceGuid.getText())) {
             if (!DataValidation.isC_NameType(this.jTextFieldTokenSpaceGuid.getText())) {
-        Log
+                Log.wrn("Update PcdCoded",
-            .wrn("Update PcdCoded",
                         "Incorrect data type for the selected pcd entry, please check in in spd file");
                 return false;
             }
@@ -481,8 +473,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         // Check DefaultValue
         //
         if (!isEmpty(this.jTextFieldDefaultValue.getText())) {
-      if (!DataValidation.isDefaultValueType(this.jTextFieldDefaultValue
+            if (!DataValidation.isDefaultValueType(this.jTextFieldDefaultValue.getText())) {
-          .getText())) {
                 Log.wrn("Update PcdCoded", "Incorrect data type for Default Value");
                 return false;
             }
@@ -541,20 +532,15 @@ public class PCDsDlg extends IDialog implements ItemListener {
      */
     public void itemStateChanged(ItemEvent arg0) {
         int index = this.jComboBoxCName.getSelectedIndex();
-    if (arg0.getSource() == this.jComboBoxCName
+        if (arg0.getSource() == this.jComboBoxCName && arg0.getStateChange() == ItemEvent.SELECTED) {
-        && arg0.getStateChange() == ItemEvent.SELECTED) {
+            if (pcd.getPcd(index).getGuidCName() == null || isEmpty(pcd.getPcd(index).getGuidCName())
-      if (pcd.getPcd(index).getGuidCName() == null
+                || pcd.getPcd(index).getType() == null || pcd.getPcd(index).getHelp() == null
-          || isEmpty(pcd.getPcd(index).getGuidCName())
-          || pcd.getPcd(index).getType() == null
-          || pcd.getPcd(index).getHelp() == null
                 || isEmpty(pcd.getPcd(index).getHelp())) {
-        Log
+                Log.wrn("select pcd entry when editing msa",
-            .wrn("select pcd entry when editing msa",
                         "The selected is defined incorrectly.\r\nPlease check it in spd file");
             } else {
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());
-        Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd
+                Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());
-            .getPcd(index).getType());
                 this.jTextAreaHelpText.setText(pcd.getPcd(index).getHelp());
                 this.jTextAreaHelpText.setSelectionStart(0);
                 this.jTextAreaHelpText.setSelectionEnd(0);

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PackageDepDlg.java

@@ -65,8 +65,6 @@ public class PackageDepDlg extends IDialog implements ItemListener {
 
     private JTextField jTextFieldPackageGuid = null;
 
-  private JButton jButtonGenerateGuid = null;
-
     private JLabel jLabelPackageVersion = null;
 
     private JTextField jTextFieldPackageVersion = null;
@@ -126,23 +124,6 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         return jTextFieldPackageGuid;
     }
 
-    /**
-     * This method initializes jButtonGenerateGuid
-     * 
-     * @return javax.swing.JButton
-     */
-    private JButton getJButtonGenerateGuid() {
-        if (jButtonGenerateGuid == null) {
-            jButtonGenerateGuid = new JButton();
-            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
-            jButtonGenerateGuid.setPreferredSize(new java.awt.Dimension(65, 20));
-            jButtonGenerateGuid.setText("GEN");
-            jButtonGenerateGuid.addActionListener(this);
-            jButtonGenerateGuid.setVisible(false);
-        }
-        return jButtonGenerateGuid;
-    }
-
     /**
      * This method initializes jTextFieldPackageVersion
      * 
@@ -154,7 +135,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
             jTextFieldPackageVersion.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jTextFieldPackageVersion.setPreferredSize(new java.awt.Dimension(320, 20));
             jTextFieldPackageVersion
-                                    .setToolTipText("If this module depends on a specific version of a package, enter the package version here.  If the module can use the latest version that does not break backward compatibility, leave this field blank");
+                                    .setToolTipText("<html>If this module depends on a specific version of a package, <br>" +
+                                            "enter the package version here.  <br>" +
+                                            "If the module can use the latest version <br>" +
+                                            "that does not break backward compatibility, <br>" +
+                                            "leave this field blank</html>");
         }
         return jTextFieldPackageVersion;
     }
@@ -379,11 +364,11 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         // Check PackageGuid
         //
         // if (!isEmpty(this.jTextFieldPackageGuid.getText())) {
-// if (!DataValidation.isGuid(this.jTextFieldPackageGuid.getText())) {
+        // if (!DataValidation.isGuid(this.jTextFieldPackageGuid.getText())) {
-// Log.err("Incorrect data type for Package Guid");
+        // Log.err("Incorrect data type for Package Guid");
-// return false;
+        // return false;
-// }
+        // }
-// }
+        // }
 
         //
         // Check PackageVersion
@@ -408,7 +393,6 @@ public class PackageDepDlg extends IDialog implements ItemListener {
         return true;
     }
 
-
     private PackageDependenciesIdentification getCurrentPackageDependencies() {
         String arg0 = this.jComboBoxPackageName.getSelectedItem().toString();
         String arg1 = this.jTextFieldPackageVersion.getText();

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PpisDlg.java

@@ -114,7 +114,8 @@ public class PpisDlg extends IDialog implements ItemListener {
             jComboBoxPpiType.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
             jComboBoxPpiType.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxPpiType.addItemListener(this);
-      jComboBoxPpiType.setToolTipText("<html>PPIs are named by GUID.<br>PPI Notify is consumed via a register PPI Notify mechanism");
+            jComboBoxPpiType
+                            .setToolTipText("<html>PPIs are named by GUID.<br>PPI Notify is consumed via a register PPI Notify mechanism");
         }
         return jComboBoxPpiType;
     }
@@ -146,7 +147,8 @@ public class PpisDlg extends IDialog implements ItemListener {
             jComboBoxUsage = new JComboBox();
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxUsage.setToolTipText("<html><table><tr><td colspan=2 align=center><b>PPI</b></td></tr><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the PPI</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module sometimes consumes the PPI</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the PPI</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module sometimes produces the PPI</td></tr><tr><td colspan=2 align=center><b>PPI Notify</b></td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will consume the PPI if it is produced. Consumption<br>is defined by executing the PPI notify function</td></tr></table></html>");
+            jComboBoxUsage
+                          .setToolTipText("<html><table><tr><td colspan=2 align=center><b>PPI</b></td></tr><tr><td>ALWAYS_CONSUMED</td><td>Module always consumes the PPI</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module sometimes consumes the PPI</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces the PPI</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module sometimes produces the PPI</td></tr><tr><td colspan=2 align=center><b>PPI Notify</b></td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module will consume the PPI if it is produced. Consumption<br>is defined by executing the PPI notify function</td></tr></table></html>");
         }
         return jComboBoxUsage;
     }
@@ -160,11 +162,9 @@ public class PpisDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 130, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
-          .setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
         return jTextFieldFeatureFlag;
     }
@@ -206,8 +206,7 @@ public class PpisDlg extends IDialog implements ItemListener {
     private JScrollPane getJScrollPaneHelpText() {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
-      jScrollPaneHelpText
+            jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-          .setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));
@@ -368,8 +367,7 @@ public class PpisDlg extends IDialog implements ItemListener {
      * 
      */
     private void initFrame() {
-    Tools.generateComboBoxByVector(jComboBoxCName, wt
+        Tools.generateComboBoxByVector(jComboBoxCName, wt.getAllPpiDeclarationsFromWorkspace());
-        .getAllPpiDeclarationsFromWorkspace());
         Tools.generateComboBoxByVector(jComboBoxPpiType, ed.getVPpiType());
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());
     }
@@ -413,8 +411,7 @@ public class PpisDlg extends IDialog implements ItemListener {
         // Check Name
         //
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {
-      if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem()
+            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {
-          .toString())) {
                 Log.wrn("Update Ppis", "Incorrect data type for Ppi/PpiNotify Name");
                 return false;
             }
@@ -433,7 +430,7 @@ public class PpisDlg extends IDialog implements ItemListener {
         return true;
     }
 
-private PpisIdentification getCurrentPpis() {
+    private PpisIdentification getCurrentPpis() {
         String arg0 = this.jComboBoxCName.getSelectedItem().toString();
         String arg1 = this.jComboBoxPpiType.getSelectedItem().toString();
         String arg2 = this.jComboBoxUsage.getSelectedItem().toString();
@@ -452,15 +449,13 @@ private PpisIdentification getCurrentPpis() {
      * Reflesh the frame when selected item changed
      * 
      */
+
     public void itemStateChanged(ItemEvent arg0) {
-    if (arg0.getSource() == this.jComboBoxPpiType
+        if (arg0.getSource() == this.jComboBoxPpiType && arg0.getStateChange() == ItemEvent.SELECTED) {
-        && arg0.getStateChange() == ItemEvent.SELECTED) {
+            if (this.jComboBoxPpiType.getSelectedItem().toString().equals(ed.getVPpiType().get(0))) {
-      if (this.jComboBoxPpiType.getSelectedItem().toString().equals(
-          ed.getVPpiType().get(0))) {
                 Tools.generateComboBoxByVector(this.jComboBoxUsage, ed.getVPpiUsage());
             } else {
-        Tools.generateComboBoxByVector(this.jComboBoxUsage, ed
+                Tools.generateComboBoxByVector(this.jComboBoxUsage, ed.getVPpiNotifyUsage());
-            .getVPpiNotifyUsage());
             }
         }
     }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/ProtocolsDlg.java

@@ -114,11 +114,9 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 130, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
-          .setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
         return jTextFieldFeatureFlag;
     }
@@ -218,8 +216,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
     private JScrollPane getJScrollPaneHelpText() {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
-      jScrollPaneHelpText
+            jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-          .setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));
@@ -305,8 +302,7 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      * @param iFrame
      * 
      */
-  public ProtocolsDlg(ProtocolsIdentification inProtocolsIdentification,
+    public ProtocolsDlg(ProtocolsIdentification inProtocolsIdentification, IFrame iFrame) {
-      IFrame iFrame) {
         super(iFrame, true);
         init(inProtocolsIdentification);
     }
@@ -396,10 +392,8 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      * 
      */
     private void initFrame() {
-    Tools
+        Tools.generateComboBoxByVector(jComboBoxProtocolType, ed.getVProtocolType());
-        .generateComboBoxByVector(jComboBoxProtocolType, ed.getVProtocolType());
+        Tools.generateComboBoxByVector(jComboBoxCName, wt.getAllProtocolDeclarationsFromWorkspace());
-    Tools.generateComboBoxByVector(jComboBoxCName, wt
-        .getAllProtocolDeclarationsFromWorkspace());
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVProtocolUsage());
     }
 
@@ -442,10 +436,8 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
         // Check Name
         //
         if (!isEmpty(this.jComboBoxCName.getSelectedItem().toString())) {
-      if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem()
+            if (!DataValidation.isC_NameType(this.jComboBoxCName.getSelectedItem().toString())) {
-          .toString())) {
+                Log.wrn("Update Protocols", "Incorrect data type for Protocol/ProtocolNotify Name");
-        Log.wrn("Update Protocols",
-            "Incorrect data type for Protocol/ProtocolNotify Name");
                 return false;
             }
         }
@@ -485,15 +477,11 @@ public class ProtocolsDlg extends IDialog implements ItemListener {
      */
 
     public void itemStateChanged(ItemEvent arg0) {
-    if (arg0.getSource() == this.jComboBoxProtocolType
+        if (arg0.getSource() == this.jComboBoxProtocolType && arg0.getStateChange() == ItemEvent.SELECTED) {
-        && arg0.getStateChange() == ItemEvent.SELECTED) {
+            if (this.jComboBoxProtocolType.getSelectedItem().toString().equals(ed.getVProtocolType().get(0))) {
-      if (this.jComboBoxProtocolType.getSelectedItem().toString().equals(
+                Tools.generateComboBoxByVector(this.jComboBoxUsage, ed.getVProtocolUsage());
-          ed.getVProtocolType().get(0))) {
-        Tools.generateComboBoxByVector(this.jComboBoxUsage, ed
-            .getVProtocolUsage());
             } else {
-        Tools.generateComboBoxByVector(this.jComboBoxUsage, ed
+                Tools.generateComboBoxByVector(this.jComboBoxUsage, ed.getVProtocolNotifyUsage());
-            .getVProtocolNotifyUsage());
             }
         }
     }

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SourceFilesDlg.java

@@ -27,9 +27,11 @@ import javax.swing.JTextField;
 
 import org.tianocore.frameworkwizard.common.DataType;
 import org.tianocore.frameworkwizard.common.DataValidation;
+import org.tianocore.frameworkwizard.common.EnumerationData;
 import org.tianocore.frameworkwizard.common.Log;
 import org.tianocore.frameworkwizard.common.Tools;
 import org.tianocore.frameworkwizard.common.ui.ArchCheckBox;
+import org.tianocore.frameworkwizard.common.ui.IComboBox;
 import org.tianocore.frameworkwizard.common.ui.IDialog;
 import org.tianocore.frameworkwizard.common.ui.IFrame;
 import org.tianocore.frameworkwizard.common.ui.StarLabel;
@@ -76,6 +78,8 @@ public class SourceFilesDlg extends IDialog {
 
     private JTextField jTextFieldToolCode = null;
 
+    private IComboBox iComboBoxToolCode = null;
+
     private JTextField jTextFieldToolChainFamily = null;
 
     private JLabel jLabelFeatureFlag = null;
@@ -95,6 +99,8 @@ public class SourceFilesDlg extends IDialog {
 
     private String msaFileName = "";
 
+    private EnumerationData ed = new EnumerationData();
+
     /**
      This method initializes jTextFieldFileName 
      
@@ -156,6 +162,19 @@ public class SourceFilesDlg extends IDialog {
         return jTextFieldTagName;
     }
 
+    private IComboBox getIComboBoxToolCode() {
+        if (iComboBoxToolCode == null) {
+            iComboBoxToolCode = new IComboBox();
+            iComboBoxToolCode.setBounds(new java.awt.Rectangle(140, 60, 340, 20));
+            iComboBoxToolCode.setPreferredSize(new java.awt.Dimension(340, 20));
+            iComboBoxToolCode.setToolTipText("<html>You may select a specific tool command from drop down list, <br>"
+                                             + "or you can DOUBLE-CLICK this fild to enter your customizing <br>"
+                                             + "tool command.<br>"
+                                             + "Press ENTER to save your input or press ESCAPE to quit</html>");
+        }
+        return iComboBoxToolCode;
+    }
+
     /**
      * This method initializes jTextFieldToolCode	
      * 	
@@ -167,6 +186,7 @@ public class SourceFilesDlg extends IDialog {
             jTextFieldToolCode.setBounds(new java.awt.Rectangle(140, 60, 340, 20));
             jTextFieldToolCode.setPreferredSize(new java.awt.Dimension(340, 20));
             jTextFieldToolCode.setToolTipText("You may specify a specific tool command, such as ASM");
+            jTextFieldToolCode.setVisible(false);
         }
         return jTextFieldToolCode;
     }
@@ -274,7 +294,32 @@ public class SourceFilesDlg extends IDialog {
         if (inSourceFilesIdentifications != null) {
             this.jTextFieldFileName.setText(inSourceFilesIdentifications.getFilename());
             this.jTextFieldTagName.setText(inSourceFilesIdentifications.getTagName());
-            this.jTextFieldToolCode.setText(inSourceFilesIdentifications.getToolCode());
+
+            //
+            // Generate Tool Code selection list
+            //
+            Vector<String> v = ed.getVToolCode();
+            boolean isFind = false;
+            String strToolCode = inSourceFilesIdentifications.getToolCode();
+
+            //
+            // If the input value is not in the default list, add it to the list
+            //
+            if (strToolCode != null) {
+                for (int index = 0; index < v.size(); index++) {
+                    if (v.elementAt(index).equals(strToolCode)) {
+                        isFind = true;
+                        break;
+                    }
+                }
+                if (!isFind && !isEmpty(strToolCode)) {
+                    v.addElement(strToolCode);
+                }
+            }
+
+            Tools.generateComboBoxByVector(iComboBoxToolCode, v);
+            this.iComboBoxToolCode.setSelectedItem(strToolCode);
+
             this.jTextFieldToolChainFamily.setText(inSourceFilesIdentifications.getToolChainFamily());
             jTextFieldFeatureFlag.setText(inSourceFilesIdentifications.getFeatureFlag());
             this.jArchCheckBox.setSelectedItems(inSourceFilesIdentifications.getSupArchList());
@@ -341,6 +386,7 @@ public class SourceFilesDlg extends IDialog {
             jContentPane.add(getJTextFieldTagName(), null);
             jContentPane.add(jLabelToolCode, null);
             jContentPane.add(getJTextFieldToolCode(), null);
+            jContentPane.add(getIComboBoxToolCode(), null);
             jContentPane.add(getJTextFieldToolChainFamily(), null);
             jContentPane.add(jLabelFeatureFlag, null);
             jContentPane.add(getJTextFieldFeatureFlag(), null);
@@ -380,7 +426,10 @@ public class SourceFilesDlg extends IDialog {
         String name = this.jTextFieldFileName.getText();
         String s[] = name.split(";");
         String tagName = this.jTextFieldTagName.getText();
-        String toolCode = this.jTextFieldToolCode.getText();
+        String toolCode = this.iComboBoxToolCode.getSelectedItem().toString();
+        if (toolCode.equals(DataType.EMPTY_SELECT_ITEM)) {
+            toolCode = "";
+        }
         String tcf = this.jTextFieldToolChainFamily.getText();
         String featureFlag = this.jTextFieldFeatureFlag.getText();
         Vector<String> arch = this.jArchCheckBox.getSelectedItemsVector();

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/SystemTablesDlg.java

@@ -109,8 +109,7 @@ public class SystemTablesDlg extends IDialog {
             jComboBoxGuidC_Name = new JComboBox();
             jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
             jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxGuidC_Name
+            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the System Table");
-          .setToolTipText("Select the GUID C Name of the System Table");
         }
         return jComboBoxGuidC_Name;
     }
@@ -127,7 +126,12 @@ public class SystemTablesDlg extends IDialog {
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxUsage
-          .setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>Module requires a GUIDed entry in the system table</td></tr><tr><td>SOMETIMES_CONSUMED</td><td>Module consumes a GUIDed entry in the system<br>table if it is present</td></tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces a GUIDed entry in the system table</td></tr><tr><td>SOMETIMES_PRODUCED</td><td>Module produces a GUIDed entry in the system table<br>for some of its execution flows.</td></tr></table></html>");
+                          .setToolTipText("<html><table>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>Module requires a GUIDed entry in the system table</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>Module consumes a GUIDed entry in the system<br>table if it is present</td>"
+                                          + "</tr><tr><td>ALWAYS_PRODUCED</td><td>Module always produces a GUIDed entry in the system table</td></tr>"
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>Module produces a GUIDed entry in the system table<br>for some of its execution flows.</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -180,17 +184,18 @@ public class SystemTablesDlg extends IDialog {
      * 
      * @returns javax.swing.JScrollPane jScrollPaneHelpText
      */
-  private JScrollPane getJScrollPaneHelpText(){
+    private JScrollPane getJScrollPaneHelpText() {
-    if (jScrollPaneHelpText == null){
+        if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
             jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
             jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320,40));
+            jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
             jScrollPaneHelpText.setLocation(new java.awt.Point(160, 60));
             jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());
         }
         return jScrollPaneHelpText;
     }
+
     /**
      * This method initializes jButtonOk
      * 
@@ -267,8 +272,7 @@ public class SystemTablesDlg extends IDialog {
      * @param iFrame
      * 
      */
-  public SystemTablesDlg(
+    public SystemTablesDlg(SystemTablesIdentification inSystemTablesIdentification, IFrame iFrame) {
-      SystemTablesIdentification inSystemTablesIdentification, IFrame iFrame) {
         super(iFrame, true);
         init(inSystemTablesIdentification);
     }
@@ -347,8 +351,7 @@ public class SystemTablesDlg extends IDialog {
      */
     private void initFrame() {
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVSystemTableUsage());
-    Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt
+        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());
-        .getAllGuidDeclarationsFromWorkspace());
     }
 
     /*

Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java

@@ -132,10 +132,12 @@ public class VariablesDlg extends IDialog {
             jComboBoxUsage.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
             jComboBoxUsage.setPreferredSize(new java.awt.Dimension(320, 20));
             jComboBoxUsage
-          .setToolTipText("<html><table><tr><td>ALWAYS_CONSUMED</td><td>The module requires the variable entry to be set</td></tr>"
+                          .setToolTipText("<html><table>"
-              + "<tr><td>SOMETIMES_CONSUMED</td><td>The module will use the variable entry if it’s set.</td></tr>"
+                                          + "<tr><td>ALWAYS_CONSUMED</td><td>The module requires the variable entry to be set</td></tr>"
+                                          + "<tr><td>SOMETIMES_CONSUMED</td><td>The module will use the variable entry if it is set.</td></tr>"
                                           + "<tr><td>ALWAYS_PRODUCED</td><td>The module will always write the variable.</td></tr>"
-              + "<tr><td>SOMETIMES_PRODUCED</td><td>The module will sometimes write the variable.</td></tr></table></html>");
+                                          + "<tr><td>SOMETIMES_PRODUCED</td><td>The module will sometimes write the variable.</td></tr>"
+                                          + "</table></html>");
         }
         return jComboBoxUsage;
     }
@@ -162,8 +164,7 @@ public class VariablesDlg extends IDialog {
     private JTextField getJTextFieldFeatureFlag() {
         if (jTextFieldFeatureFlag == null) {
             jTextFieldFeatureFlag = new JTextField();
-      jTextFieldFeatureFlag
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));
-          .setBounds(new java.awt.Rectangle(160, 130, 320, 20));
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));
             jTextFieldFeatureFlag.setToolTipText("Postfix expression that must evaluate to TRUE or FALSE");
         }
@@ -181,24 +182,23 @@ public class VariablesDlg extends IDialog {
             jTextAreaHelpText = new JTextArea();
             jTextAreaHelpText.setLineWrap(true);
             jTextAreaHelpText.setWrapStyleWord(true);
-      jTextAreaHelpText
+            jTextAreaHelpText.setToolTipText("Enter information on how to use this Variable.");
-          .setToolTipText("Enter information on how to use this Variable.");
         }
         return jTextAreaHelpText;
     }
 
-  
     private JScrollPane getJScrollPaneHelpText() {
         if (jScrollPaneHelpText == null) {
             jScrollPaneHelpText = new JScrollPane();
             jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-      jScrollPaneHelpText.setSize(new java.awt.Dimension(320,40));
+            jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320,40));
+            jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));
-      jScrollPaneHelpText.setLocation(new java.awt.Point(160,85));
+            jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));
             jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());
         }
         return jScrollPaneHelpText;
     }
+
     /**
      * This method initializes jComboBoxGuidC_Name
      * 
@@ -210,8 +210,7 @@ public class VariablesDlg extends IDialog {
             jComboBoxGuidC_Name = new JComboBox();
             jComboBoxGuidC_Name.setBounds(new java.awt.Rectangle(160, 35, 320, 20));
             jComboBoxGuidC_Name.setPreferredSize(new java.awt.Dimension(320, 20));
-      jComboBoxGuidC_Name
+            jComboBoxGuidC_Name.setToolTipText("Select the GUID C Name of the Variable.");
-          .setToolTipText("Select the GUID C Name of the Variable.");
         }
         return jComboBoxGuidC_Name;
     }
@@ -293,8 +292,7 @@ public class VariablesDlg extends IDialog {
      * @param iFrame
      * 
      */
-  public VariablesDlg(VariablesIdentification inVariablesIdentification,
+    public VariablesDlg(VariablesIdentification inVariablesIdentification, IFrame iFrame) {
-      IFrame iFrame) {
         super(iFrame, true);
         init(inVariablesIdentification);
     }
@@ -408,8 +406,7 @@ public class VariablesDlg extends IDialog {
      */
     private void initFrame() {
         Tools.generateComboBoxByVector(jComboBoxUsage, ed.getVPpiUsage());
-    Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt
+        Tools.generateComboBoxByVector(jComboBoxGuidC_Name, wt.getAllGuidDeclarationsFromWorkspace());
-        .getAllGuidDeclarationsFromWorkspace());
     }
 
     /**
@@ -433,8 +430,7 @@ public class VariablesDlg extends IDialog {
         }
 
         if (!isEmpty(this.jTextFieldVariableName.getText())) {
-      if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName
+            if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName.getText())) {
-          .getText())) {
                 Log.wrn("Update Variables", "Incorrect data type for Variable Name");
                 return false;
             }