1. Fix bug for wrong Variable name in msa file

2. Release cursor after saving files.
3. Adjust some file's coding style.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java
index fe97d8ac68a91f6861772454814edfc67a809fa3..95c06b8200ab0812ee93601a8a75315e55fa3cbc 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/About.java
@@ -35,13 +35,13 @@ import javax.swing.ImageIcon;
 public class About extends IDialog {\r
 \r
     ///\r
 public class About extends IDialog {\r
 \r
     ///\r

-    /// Define class Serial Version UID\r
+    /// Define Class Serial Version UID\r

     ///\r
     private static final long serialVersionUID = 2958136136667310962L;\r
 \r
     ///\r
     private static final long serialVersionUID = 2958136136667310962L;\r
 \r

-    //\r
-    //Define class members\r
-    //\r
+    ///\r
+    /// Define Class Members\r
+    ///\r

     private JPanel jContentPane = null;\r
 \r
     private JLabel jLabel = null;\r
     private JPanel jContentPane = null;\r
 \r
     private JLabel jLabel = null;\r


@@ -70,11 +70,6 @@ public class About extends IDialog {
         return jButtonOK;\r
     }\r
 \r
         return jButtonOK;\r
     }\r
 \r

-    public static void main(String[] args) {\r
-        About a = new About();\r
-        a.setVisible(true);\r
-    }\r
-\r

     /**\r
      This is the default constructor\r
      \r
     /**\r
      This is the default constructor\r
      \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
index 9253793ca966d137311af29b506413fff59a26a9..3d8c267484e5290e81ae4ec9726be05e1c4076c8 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
@@ -51,14 +51,21 @@ import org.tianocore.frameworkwizard.workspace.Workspace;
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 import javax.swing.JComboBox;\r
 \r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 import javax.swing.JComboBox;\r
 \r

+/**\r
+ The class is used to provide functions to clone workspace, module, package and platform\r
+ It extends IDialog\r
+\r
+ **/\r

 public class Clone extends IDialog {\r
 \r
 public class Clone extends IDialog {\r
 \r

-    /**\r
-     Define class members\r
-     \r
-     **/\r
+    ///\r
+    /// Define Class Serial Version UID\r
+    ///\r

     private static final long serialVersionUID = -5469299324965727137L;\r
 \r
     private static final long serialVersionUID = -5469299324965727137L;\r
 \r

+    ///\r
+    /// Define Class Members\r
+    ///\r

     private JPanel jContentPane = null;\r
 \r
     private JLabel jLabelType = null;\r
     private JPanel jContentPane = null;\r
 \r
     private JLabel jLabelType = null;\r


@@ -93,16 +100,20 @@ public class Clone extends IDialog {
 \r
     private JButton jButtonGenerateGuid = null;\r
 \r
 \r
     private JButton jButtonGenerateGuid = null;\r
 \r

+    private JLabel jLabelBelong = null;\r
+\r
+    private JComboBox jComboBoxExistingPackage = null;\r
+\r
+    ///\r
+    /// Define members not for UI\r
+    ///\r
+\r

     private int mode = -1;\r
 \r
     private Vector<PackageIdentification> packages = null;\r
 \r
     private WorkspaceTools wt = new WorkspaceTools();\r
 \r
     private int mode = -1;\r
 \r
     private Vector<PackageIdentification> packages = null;\r
 \r
     private WorkspaceTools wt = new WorkspaceTools();\r
 \r

-    private JLabel jLabelBelong = null;\r
-\r
-    private JComboBox jComboBoxExistingPackage = null;\r
-\r

     private Identification oldId = null;\r
 \r
     private Identification newId = null;\r
     private Identification oldId = null;\r
 \r
     private Identification newId = null;\r


@@ -114,10 +125,11 @@ public class Clone extends IDialog {
     private PlatformIdentification fid = null;\r
 \r
     /**\r
     private PlatformIdentification fid = null;\r
 \r
     /**\r

-     * This method initializes jTextFieldType  \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
+     This method initializes jTextFieldType    \r
+     \r
+     @return javax.swing.JTextField\r
+     \r
+     **/\r

     private JTextField getJTextFieldType() {\r
         if (jTextFieldType == null) {\r
             jTextFieldType = new JTextField();\r
     private JTextField getJTextFieldType() {\r
         if (jTextFieldType == null) {\r
             jTextFieldType = new JTextField();\r


@@ -128,10 +140,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldSource        \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
+     This method initializes jTextFieldSource  \r
+     \r
+     @return javax.swing.JTextField    \r
+     \r
+     **/\r

     private JTextField getJTextFieldSource() {\r
         if (jTextFieldSource == null) {\r
             jTextFieldSource = new JTextField();\r
     private JTextField getJTextFieldSource() {\r
         if (jTextFieldSource == null) {\r
             jTextFieldSource = new JTextField();\r


@@ -142,10 +155,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jButtonBrowse   \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
+     This method initializes jButtonBrowse     \r
+     \r
+     @return javax.swing.JButton       \r
+     \r
+     **/\r

     private JButton getJButtonBrowse() {\r
         if (jButtonBrowse == null) {\r
             jButtonBrowse = new JButton();\r
     private JButton getJButtonBrowse() {\r
         if (jButtonBrowse == null) {\r
             jButtonBrowse = new JButton();\r


@@ -157,10 +171,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldDestinationFile       \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
+     This method initializes jTextFieldDestinationFile \r
+     \r
+     @return javax.swing.JTextField    \r
+     \r
+     **/\r

     private JTextField getJTextFieldFilePath() {\r
         if (jTextFieldFilePath == null) {\r
             jTextFieldFilePath = new JTextField();\r
     private JTextField getJTextFieldFilePath() {\r
         if (jTextFieldFilePath == null) {\r
             jTextFieldFilePath = new JTextField();\r


@@ -170,10 +185,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldBaseName      \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
+     This method initializes jTextFieldBaseName        \r
+     \r
+     @return javax.swing.JTextField    \r
+     \r
+     **/\r

     private JTextField getJTextFieldBaseName() {\r
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r
     private JTextField getJTextFieldBaseName() {\r
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r


@@ -183,10 +199,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldGuid  \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
+     This method initializes jTextFieldGuid    \r
+     \r
+     @return javax.swing.JTextField    \r
+     \r
+     **/\r

     private JTextField getJTextFieldGuid() {\r
         if (jTextFieldGuid == null) {\r
             jTextFieldGuid = new JTextField();\r
     private JTextField getJTextFieldGuid() {\r
         if (jTextFieldGuid == null) {\r
             jTextFieldGuid = new JTextField();\r


@@ -196,10 +213,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldVersion       \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
+     This method initializes jTextFieldVersion \r
+     \r
+     @return javax.swing.JTextField    \r
+     \r
+     **/\r

     private JTextField getJTextFieldVersion() {\r
         if (jTextFieldVersion == null) {\r
             jTextFieldVersion = new JTextField();\r
     private JTextField getJTextFieldVersion() {\r
         if (jTextFieldVersion == null) {\r
             jTextFieldVersion = new JTextField();\r


@@ -209,10 +227,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jButtonOk       \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
+     This method initializes jButtonOk \r
+     \r
+     @return javax.swing.JButton       \r
+     \r
+     **/\r

     private JButton getJButtonOk() {\r
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r
     private JButton getJButtonOk() {\r
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r


@@ -224,10 +243,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jButtonCancel   \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
+     This method initializes jButtonCancel     \r
+     \r
+     @return javax.swing.JButton       \r
+     \r
+     **/\r

     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r
     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r


@@ -239,10 +259,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jButtonGenerateGuid     \r
-     *         \r
-     * @return javax.swing.JButton     \r
-     */\r
+     This method initializes jButtonGenerateGuid       \r
+     \r
+     @return javax.swing.JButton       \r
+     \r
+     **/\r

     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
             jButtonGenerateGuid = new JButton();\r
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
             jButtonGenerateGuid = new JButton();\r


@@ -254,10 +275,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jComboBoxExistingPackage        \r
-     *         \r
-     * @return javax.swing.JComboBox   \r
-     */\r
+     This method initializes jComboBoxExistingPackage  \r
+     \r
+     @return javax.swing.JComboBox     \r
+     \r
+     **/\r

     private JComboBox getJComboBoxExistingPackage() {\r
         if (jComboBoxExistingPackage == null) {\r
             jComboBoxExistingPackage = new JComboBox();\r
     private JComboBox getJComboBoxExistingPackage() {\r
         if (jComboBoxExistingPackage == null) {\r
             jComboBoxExistingPackage = new JComboBox();\r


@@ -267,24 +289,21 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     \r
-     @param args\r
+     This is the default constructor\r

      \r
      **/\r
      \r
      **/\r

-    public static void main(String[] args) {\r
-\r
-    }\r
-\r
-    /**\r
-     * This is the default constructor\r
-     */\r

     public Clone() {\r
         super();\r
         init();\r
     }\r
 \r
     /**\r
     public Clone() {\r
         super();\r
         init();\r
     }\r
 \r
     /**\r

-     This is the default constructor\r
+     This is the override constructor\r
+     \r
+     @param parentFrame       The parent frame which starts this frame\r
+     @param modal             To identify the frame's modal\r
+     @param fileType          To identify the clone target type\r
+     @param identification    The clone target's identification\r

      \r
      **/\r
     public Clone(IFrame parentFrame, boolean modal, int fileType, Identification identification) {\r
      \r
      **/\r
     public Clone(IFrame parentFrame, boolean modal, int fileType, Identification identification) {\r


@@ -311,10 +330,9 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes this\r
-     * \r
-     * @return void\r
-     */\r
+     This method initializes this\r
+     \r
+     **/\r

     private void init() {\r
         this.setSize(550, 260);\r
         this.setContentPane(getJContentPane());\r
     private void init() {\r
         this.setSize(550, 260);\r
         this.setContentPane(getJContentPane());\r


@@ -323,12 +341,17 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes this\r
-     * \r
-     * @return void\r
-     */\r
+     This method initializes this with given clone target type.\r
+     Customize the frame interface via different clone target type.\r
+     \r
+     @param mode To identify the clone target type\r
+     \r
+     **/\r

     private void init(int mode) {\r
         init();\r
     private void init(int mode) {\r
         init();\r

+        //\r
+        // For MODULE_SURFACE_AREA\r
+        //\r

         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
             this.jTextFieldType.setText(DataType.MODULE_SURFACE_AREA);\r
             String s = oldId.getPath();\r
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
             this.jTextFieldType.setText(DataType.MODULE_SURFACE_AREA);\r
             String s = oldId.getPath();\r


@@ -341,6 +364,9 @@ public class Clone extends IDialog {
             this.jTextFieldFilePath.setSize(320, this.jTextFieldFilePath.getSize().height);\r
             this.jLabelDestinationFile.setText("New Module Path and Filename");\r
         }\r
             this.jTextFieldFilePath.setSize(320, this.jTextFieldFilePath.getSize().height);\r
             this.jLabelDestinationFile.setText("New Module Path and Filename");\r
         }\r

+        //\r
+        // For PACKAGE_SURFACE_AREA\r
+        //\r

         if (mode == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
             this.jTextFieldType.setText(DataType.PACKAGE_SURFACE_AREA);\r
             String s = oldId.getPath();\r
         if (mode == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
             this.jTextFieldType.setText(DataType.PACKAGE_SURFACE_AREA);\r
             String s = oldId.getPath();\r


@@ -353,6 +379,9 @@ public class Clone extends IDialog {
             this.jTextFieldFilePath.setSize(320, this.jTextFieldFilePath.getSize().height);\r
             this.jLabelDestinationFile.setText("New Package Path and Filename");\r
         }\r
             this.jTextFieldFilePath.setSize(320, this.jTextFieldFilePath.getSize().height);\r
             this.jLabelDestinationFile.setText("New Package Path and Filename");\r
         }\r

+        //\r
+        // For PLATFORM_SURFACE_AREA\r
+        //\r

         if (mode == DataType.RETURN_TYPE_PLATFORM_SURFACE_AREA) {\r
             this.jTextFieldType.setText(DataType.PLATFORM_SURFACE_AREA);\r
             this.jTextFieldSource.setText(oldId.getPath());\r
         if (mode == DataType.RETURN_TYPE_PLATFORM_SURFACE_AREA) {\r
             this.jTextFieldType.setText(DataType.PLATFORM_SURFACE_AREA);\r
             this.jTextFieldSource.setText(oldId.getPath());\r


@@ -362,6 +391,9 @@ public class Clone extends IDialog {
                                    .setToolTipText("Select platform path here. For example, C:\\MyWorkspace\\EdkNt32Pkg\\Nt32.fpd");\r
             this.jLabelDestinationFile.setText("New Platform Path and Filename");\r
         }\r
                                    .setToolTipText("Select platform path here. For example, C:\\MyWorkspace\\EdkNt32Pkg\\Nt32.fpd");\r
             this.jLabelDestinationFile.setText("New Platform Path and Filename");\r
         }\r

+        //\r
+        // For WORKSPACE\r
+        //\r

         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r
             this.jTextFieldType.setText(DataType.WORKSPACE);\r
             this.jTextFieldSource.setText(Workspace.getCurrentWorkspace());\r
         if (mode == DataType.RETURN_TYPE_WORKSPACE) {\r
             this.jTextFieldType.setText(DataType.WORKSPACE);\r
             this.jTextFieldSource.setText(Workspace.getCurrentWorkspace());\r


@@ -380,10 +412,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jContentPane\r
-     * \r
-     * @return javax.swing.JPanel\r
-     */\r
+     This method initializes jContentPane\r
+     \r
+     @return javax.swing.JPanel\r
+     \r
+     **/\r

     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelBelong = new JLabel();\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelBelong = new JLabel();\r


@@ -446,6 +479,9 @@ public class Clone extends IDialog {
         if (arg0.getSource() == jButtonOk) {\r
             if (this.check()) {\r
                 try {\r
         if (arg0.getSource() == jButtonOk) {\r
             if (this.check()) {\r
                 try {\r

+                    //\r
+                    // Save to file\r
+                    //\r

                     this.save();\r
                 } catch (IOException e) {\r
                     Log.wrn("Clone", e.getMessage());\r
                     this.save();\r
                 } catch (IOException e) {\r
                     Log.wrn("Clone", e.getMessage());\r


@@ -471,7 +507,7 @@ public class Clone extends IDialog {
         }\r
 \r
         //\r
         }\r
 \r
         //\r

-        // Use different file ext\r
+        // Use different file ext for different clone target type\r

         //\r
         if (arg0.getSource() == this.jButtonBrowse) {\r
             JFileChooser fc = new JFileChooser();\r
         //\r
         if (arg0.getSource() == this.jButtonBrowse) {\r
             JFileChooser fc = new JFileChooser();\r


@@ -501,9 +537,14 @@ public class Clone extends IDialog {
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    //\r
-    // Check name, guid and version\r
-    //\r
+    /**\r
+     Check name, guid and version.\r
+     If all of them are valid, save information to new id\r
+     \r
+     @retval true   All name, guid and version are valid\r
+     @retval false  Any one of name, guid and version is invalid\r
+     \r
+     **/\r

     private boolean checkId() {\r
         //\r
         // Check Basename\r
     private boolean checkId() {\r
         //\r
         // Check Basename\r


@@ -555,7 +596,8 @@ public class Clone extends IDialog {
     /**\r
      Check before save\r
      \r
     /**\r
      Check before save\r
      \r

-     @return\r
+     @retval true   All check points are passed\r
+     @retval false  Any one of check points is failed\r

      \r
      **/\r
     private boolean check() {\r
      \r
      **/\r
     private boolean check() {\r


@@ -598,10 +640,6 @@ public class Clone extends IDialog {
         // Check for Module\r
         //\r
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
         // Check for Module\r
         //\r
         if (mode == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r

-            //            if (trg.indexOf(DataType.DOS_FILE_SEPARATOR) == -1 && trg.indexOf(DataType.UNIX_FILE_SEPARATOR) == -1) {\r
-            //                Log.err("The module name must include a path");\r
-            //                return false;\r
-            //            }\r

             trg = this.getModulePath();\r
             if (src.equals(trg)) {\r
                 Log.wrn("Clone", "The source and destination couldn't be same");\r
             trg = this.getModulePath();\r
             if (src.equals(trg)) {\r
                 Log.wrn("Clone", "The source and destination couldn't be same");\r


@@ -655,6 +693,14 @@ public class Clone extends IDialog {
         return true;\r
     }\r
 \r
         return true;\r
     }\r
 \r

+    /**\r
+     Save clone target to new location\r
+     \r
+     @throws IOException\r
+     @throws XmlException\r
+     @throws Exception\r
+     \r
+     **/\r

     private void save() throws IOException, XmlException, Exception {\r
         String src = this.oldId.getPath();\r
         String trg = this.jTextFieldFilePath.getText();\r
     private void save() throws IOException, XmlException, Exception {\r
         String src = this.oldId.getPath();\r
         String trg = this.jTextFieldFilePath.getText();\r


@@ -703,7 +749,7 @@ public class Clone extends IDialog {
             msa.getMsaHeader().setVersion(newId.getVersion());\r
 \r
             //\r
             msa.getMsaHeader().setVersion(newId.getVersion());\r
 \r
             //\r

-            // Update Cloned From element\r
+            // Update <Cloned> Section\r

             //\r
             updateModuleClonedId(msa, oldId);\r
 \r
             //\r
             updateModuleClonedId(msa, oldId);\r
 \r


@@ -743,6 +789,9 @@ public class Clone extends IDialog {
             newId.setPath(trg);\r
             vFiles = wt.getAllPakcageFilesPath(src);\r
 \r
             newId.setPath(trg);\r
             vFiles = wt.getAllPakcageFilesPath(src);\r
 \r

+            //\r
+            // First copy all files to new directory\r
+            //\r

             FileOperation.copyFile(src, trg);\r
             for (int index = 1; index < vFiles.size(); index++) {\r
                 String oldFile = vFiles.get(index);\r
             FileOperation.copyFile(src, trg);\r
             for (int index = 1; index < vFiles.size(); index++) {\r
                 String oldFile = vFiles.get(index);\r


@@ -750,16 +799,6 @@ public class Clone extends IDialog {
                 FileOperation.copyFile(oldFile, newFile);\r
             }\r
 \r
                 FileOperation.copyFile(oldFile, newFile);\r
             }\r
 \r

-            //\r
-            // First copy all files to new directory\r
-            //\r
-            //FileOperation.copyFolder(Tools.getFilePathOnly(src), Tools.getFilePathOnly(trg));\r
-\r
-            //\r
-            // Delete old spd file\r
-            //\r
-            //FileOperation.delFile(Tools.getFilePathOnly(trg) + DataType.FILE_SEPARATOR + Tools.getFileNameOnly(src));\r
-\r

             //\r
             // Create new spd file\r
             //\r
             //\r
             // Create new spd file\r
             //\r


@@ -774,7 +813,7 @@ public class Clone extends IDialog {
             spd.getSpdHeader().setVersion(newId.getVersion());\r
 \r
             //\r
             spd.getSpdHeader().setVersion(newId.getVersion());\r
 \r
             //\r

-            // Update Cloned From element\r
+            // Update <Cloned> Section\r

             //\r
             updatePackageClonedId(spd, oldId);\r
 \r
             //\r
             updatePackageClonedId(spd, oldId);\r
 \r


@@ -835,10 +874,23 @@ public class Clone extends IDialog {
         vFiles = null;\r
     }\r
 \r
         vFiles = null;\r
     }\r
 \r

+    /**\r
+     Get the path of selected package\r
+     \r
+     @return String The path of selected package\r
+     \r
+     **/\r

     private String getSelectPackagePath() {\r
         return Tools.getFilePathOnly(packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getPath());\r
     }\r
 \r
     private String getSelectPackagePath() {\r
         return Tools.getFilePathOnly(packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getPath());\r
     }\r
 \r

+    /**\r
+     Get the path of source module\r
+     Since the path of source module is relative, make it up to full path.\r
+     \r
+     @return String The full path of source module\r
+     \r
+     **/\r

     private String getModulePath() {\r
         String trg = this.jTextFieldFilePath.getText();\r
         trg = Tools.addPathExt(trg, mode);\r
     private String getModulePath() {\r
         String trg = this.jTextFieldFilePath.getText();\r
         trg = Tools.addPathExt(trg, mode);\r


@@ -847,6 +899,13 @@ public class Clone extends IDialog {
         return trg;\r
     }\r
 \r
         return trg;\r
     }\r
 \r

+    /**\r
+     Get the path of source package\r
+     Since the path of source package is relative, make it up to full path.\r
+     \r
+     @return String The full path of source package\r
+     \r
+     **/\r

     private String getPackagePath() {\r
         String trg = this.jTextFieldFilePath.getText();\r
         trg = Tools.addPathExt(trg, mode);\r
     private String getPackagePath() {\r
         String trg = this.jTextFieldFilePath.getText();\r
         trg = Tools.addPathExt(trg, mode);\r


@@ -856,11 +915,11 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     Set target item's Cloned From element\r
-\r
-     @param id\r
-     @return\r
-\r
+     Set msa file's <Cloned> section via given identification\r
+     \r
+     @param msa ModuleSurfaceArea for clone target\r
+     @param id Identification of clone source\r
+     \r

      **/\r
     private void updateModuleClonedId(ModuleSurfaceArea msa, Identification id) {\r
         //\r
      **/\r
     private void updateModuleClonedId(ModuleSurfaceArea msa, Identification id) {\r
         //\r


@@ -914,10 +973,10 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     Set target item's Cloned From element\r
+     Set spd file's <Cloned> section via given identification\r

      \r
      \r

-     @param id\r
-     @return\r
+     @param spd PackageSurfaceArea for clone target\r
+     @param id Identification of clone source\r

      \r
      **/\r
     private void updatePackageClonedId(PackageSurfaceArea spd, Identification id) {\r
      \r
      **/\r
     private void updatePackageClonedId(PackageSurfaceArea spd, Identification id) {\r


@@ -970,10 +1029,10 @@ public class Clone extends IDialog {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     Set target item's Cloned From element\r
+     Set fpd file's <Cloned> section via given identification\r

      \r
      \r

-     @param id\r
-     @return\r
+     @param fpd PlatformSurfaceArea for clone target\r
+     @param id Identification of clone source\r

      \r
      **/\r
     private void updatePlatformClonedId(PlatformSurfaceArea fpd, Identification id) {\r
      \r
      **/\r
     private void updatePlatformClonedId(PlatformSurfaceArea fpd, Identification id) {\r


@@ -1025,26 +1084,62 @@ public class Clone extends IDialog {
         fpd.setPlatformDefinitions(pd);\r
     }\r
 \r
         fpd.setPlatformDefinitions(pd);\r
     }\r
 \r

+    /**\r
+     Get PlatformIdentification\r
+     \r
+     @return PlatformIdentification\r
+     \r
+     **/\r

     public PlatformIdentification getFid() {\r
         return fid;\r
     }\r
 \r
     public PlatformIdentification getFid() {\r
         return fid;\r
     }\r
 \r

+    /**\r
+     Set PlatformIdentification\r
+     \r
+     @param fid PlatformIdentification\r
+     \r
+     **/\r

     public void setFid(PlatformIdentification fid) {\r
         this.fid = fid;\r
     }\r
 \r
     public void setFid(PlatformIdentification fid) {\r
         this.fid = fid;\r
     }\r
 \r

+    /**\r
+     Get ModuleIdentification\r
+     \r
+     @return ModuleIdentification\r
+     \r
+     **/\r

     public ModuleIdentification getMid() {\r
         return mid;\r
     }\r
 \r
     public ModuleIdentification getMid() {\r
         return mid;\r
     }\r
 \r

+    /**\r
+     Set ModuleIdentification\r
+     \r
+     @param mid ModuleIdentification\r
+     \r
+     **/\r

     public void setMid(ModuleIdentification mid) {\r
         this.mid = mid;\r
     }\r
 \r
     public void setMid(ModuleIdentification mid) {\r
         this.mid = mid;\r
     }\r
 \r

+    /**\r
+     Get PackageIdentification\r
+     \r
+     @return PackageIdentification\r
+     \r
+     **/\r

     public PackageIdentification getPid() {\r
         return pid;\r
     }\r
 \r
     public PackageIdentification getPid() {\r
         return pid;\r
     }\r
 \r

+    /**\r
+     Set PackageIdentification\r
+     \r
+     @param pid PackageIdentification\r
+     \r
+     **/\r

     public void setPid(PackageIdentification pid) {\r
         this.pid = pid;\r
     }\r
     public void setPid(PackageIdentification pid) {\r
         this.pid = pid;\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index 3c960b4699f956fa7d15a173ab78ae731a623424..e916dbcd7f15ba0393b9c570b9ea89a88fe82042 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -108,8 +108,8 @@ import org.tianocore.frameworkwizard.workspace.WorkspaceTools;
 import org.tianocore.frameworkwizard.workspace.ui.SwitchWorkspace;\r
 \r
 /**\r
 import org.tianocore.frameworkwizard.workspace.ui.SwitchWorkspace;\r
 \r
 /**\r

- The class is used to show main GUI of ModuleEditor\r
- It extends IFrame implements MouseListener, TreeSelectionListener\r
+ The class is used to show main GUI of FrameworkWizard\r
+ It extends IFrame implements MouseListener, TreeSelectionListener, ComponentListener and MenuListener\r

 \r
  **/\r
 public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSelectionListener, ComponentListener,\r
 \r
  **/\r
 public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSelectionListener, ComponentListener,\r


@@ -119,9 +119,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     ///\r
     private static final long serialVersionUID = -7103240960573031772L;\r
 \r
     ///\r
     private static final long serialVersionUID = -7103240960573031772L;\r
 \r

-    //\r
-    // To save information of all files\r
-    //\r
+    ///\r
+    /// Used to save information of all files\r
+    ///\r

     private Vector<ModuleIdentification> vModuleList = new Vector<ModuleIdentification>();\r
 \r
     private Vector<PackageIdentification> vPackageList = new Vector<PackageIdentification>();\r
     private Vector<ModuleIdentification> vModuleList = new Vector<ModuleIdentification>();\r
 \r
     private Vector<PackageIdentification> vPackageList = new Vector<PackageIdentification>();\r


@@ -140,6 +140,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \r
     private int currentOpeningPlatformIndex = -1;\r
 \r
 \r
     private int currentOpeningPlatformIndex = -1;\r
 \r

+    ///\r
+    /// Used to generate tree structure\r
+    ///\r

     private IDefaultMutableTreeNode dmtnRoot = null;\r
 \r
     private IDefaultMutableTreeNode dmtnModuleDescription = null;\r
     private IDefaultMutableTreeNode dmtnRoot = null;\r
 \r
     private IDefaultMutableTreeNode dmtnModuleDescription = null;\r


@@ -148,6 +151,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \r
     private IDefaultMutableTreeNode dmtnPlatformDescription = null;\r
 \r
 \r
     private IDefaultMutableTreeNode dmtnPlatformDescription = null;\r
 \r

+    ///\r
+    /// Used for UI\r
+    ///\r

     private JPanel jContentPane = null;\r
 \r
     private JMenuBar jMenuBar = null;\r
     private JPanel jContentPane = null;\r
 \r
     private JMenuBar jMenuBar = null;\r


@@ -292,16 +298,19 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \r
     private JMenuItem jMenuItemProjectRemoveFar = null;\r
 \r
 \r
     private JMenuItem jMenuItemProjectRemoveFar = null;\r
 \r

-    //private JToolBar jToolBarFile = null;\r
-\r
-    //private JToolBar jToolBarEdit = null;\r
-\r
-    //private JToolBar jToolBarWindow = null;\r
+    private JMenuItem jMenuItemProjectCreateFar = null;\r

 \r
 \r

+    ///\r
+    /// A static definition for this class itself\r
+    ///\r

     private static FrameworkWizardUI fwui = null;\r
 \r
     private static FrameworkWizardUI fwui = null;\r
 \r

-    private JMenuItem jMenuItemProjectCreateFar = null;\r
-\r
+    /**\r
+     If the class hasn't an instnace, new one.\r
+     \r
+     @return FrameworkWizardUI The instance of this class\r
+     \r
+     **/\r

     public static FrameworkWizardUI getInstance() {\r
         if (fwui == null) {\r
             fwui = new FrameworkWizardUI();\r
     public static FrameworkWizardUI getInstance() {\r
         if (fwui == null) {\r
             fwui = new FrameworkWizardUI();\r


@@ -351,7 +360,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JTabbedPane   \r
      \r
      \r
      @return javax.swing.JTabbedPane   \r
      \r

-     */\r
+     **/\r

     private JTabbedPane getJTabbedPaneEditor() {\r
         if (jTabbedPaneEditor == null) {\r
             jTabbedPaneEditor = new JTabbedPane();\r
     private JTabbedPane getJTabbedPaneEditor() {\r
         if (jTabbedPaneEditor == null) {\r
             jTabbedPaneEditor = new JTabbedPane();\r


@@ -363,7 +372,6 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                              .setMinimumSize(new java.awt.Dimension(\r
                                                                     DataType.MAIN_FRAME_EDITOR_PANEL_PREFERRED_SIZE_WIDTH,\r
                                                                     DataType.MAIN_FRAME_EDITOR_PANEL_PREFERRED_SIZE_HEIGHT));\r
                              .setMinimumSize(new java.awt.Dimension(\r
                                                                     DataType.MAIN_FRAME_EDITOR_PANEL_PREFERRED_SIZE_WIDTH,\r
                                                                     DataType.MAIN_FRAME_EDITOR_PANEL_PREFERRED_SIZE_HEIGHT));\r

-            //jTabbedPaneEditor.addChangeListener(this);\r

             jTabbedPaneEditor.addTab("Module", null, getJDesktopPaneModule(), null);\r
             jTabbedPaneEditor.addTab("Package", null, getJDesktopPanePackage(), null);\r
             jTabbedPaneEditor.addTab("Platform", null, getJDesktopPanePlatform(), null);\r
             jTabbedPaneEditor.addTab("Module", null, getJDesktopPaneModule(), null);\r
             jTabbedPaneEditor.addTab("Package", null, getJDesktopPanePackage(), null);\r
             jTabbedPaneEditor.addTab("Platform", null, getJDesktopPanePlatform(), null);\r


@@ -376,7 +384,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JTabbedPane   \r
      \r
      \r
      @return javax.swing.JTabbedPane   \r
      \r

-     */\r
+     **/\r

     private JTabbedPane getJTabbedPaneTree() {\r
         if (jTabbedPaneTree == null) {\r
             jTabbedPaneTree = new JTabbedPane();\r
     private JTabbedPane getJTabbedPaneTree() {\r
         if (jTabbedPaneTree == null) {\r
             jTabbedPaneTree = new JTabbedPane();\r


@@ -400,29 +408,35 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      **/\r
     private JMenu getJMenuFile() {\r
         if (jMenuFile == null) {\r
      **/\r
     private JMenu getJMenuFile() {\r
         if (jMenuFile == null) {\r

+            //\r
+            // Set jMenuFile's attributes\r
+            //\r

             jMenuFile = new JMenu();\r
             jMenuFile.setText("File");\r
             jMenuFile.setMnemonic('F');\r
             jMenuFile = new JMenu();\r
             jMenuFile.setText("File");\r
             jMenuFile.setMnemonic('F');\r

+            jMenuFile.addMenuListener(this);\r
+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuFile.add(getJMenuItemFileNew());\r
             jMenuFile.add(getJMenuItemFileOpen());\r
             jMenuFile.add(getJMenuItemFileClose());\r
             jMenuFile.add(getJMenuItemFileCloseAll());\r
             jMenuFile.addSeparator();\r
             jMenuFile.add(getJMenuItemFileNew());\r
             jMenuFile.add(getJMenuItemFileOpen());\r
             jMenuFile.add(getJMenuItemFileClose());\r
             jMenuFile.add(getJMenuItemFileCloseAll());\r
             jMenuFile.addSeparator();\r

+\r

             jMenuFile.add(getJMenuFileRecentFiles());\r
             jMenuFile.add(getJMenuFileRecentFiles());\r

-            //jMenuFile.addSeparator();\r

             jMenuFile.add(getJMenuItemFileSave());\r
             jMenuFile.add(getJMenuItemFileSaveAs());\r
             jMenuFile.add(getJMenuItemFileSaveAll());\r
             jMenuFile.addSeparator();\r
             jMenuFile.add(getJMenuItemFileSave());\r
             jMenuFile.add(getJMenuItemFileSaveAs());\r
             jMenuFile.add(getJMenuItemFileSaveAll());\r
             jMenuFile.addSeparator();\r

+\r

             jMenuFile.add(getJMenuItemFilePageSetup());\r
             jMenuFile.add(getJMenuItemFilePrint());\r
             jMenuFile.add(getJMenuItemFilePageSetup());\r
             jMenuFile.add(getJMenuItemFilePrint());\r

-            //jMenuFile.addSeparator();\r

             jMenuFile.add(getJMenuItemFileImport());\r
             jMenuFile.add(getJMenuItemFileImport());\r

-            //jMenuFile.addSeparator();\r

             jMenuFile.add(getJMenuItemFileProperties());\r
             jMenuFile.add(getJMenuItemFileProperties());\r

-            //jMenuFile.addSeparator();\r
+\r

             jMenuFile.add(getJMenuItemFileExit());\r
             jMenuFile.add(getJMenuItemFileExit());\r

-            jMenuFile.addMenuListener(this);\r

         }\r
         return jMenuFile;\r
     }\r
         }\r
         return jMenuFile;\r
     }\r


@@ -469,22 +483,31 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      **/\r
     private JMenu getJMenuEdit() {\r
         if (jMenuEdit == null) {\r
      **/\r
     private JMenu getJMenuEdit() {\r
         if (jMenuEdit == null) {\r

+            //\r
+            // Set jMenuEdit's attributes\r
+            //\r

             jMenuEdit = new JMenu();\r
             jMenuEdit.setText("Edit");\r
             jMenuEdit.setMnemonic('E');\r
             jMenuEdit = new JMenu();\r
             jMenuEdit.setText("Edit");\r
             jMenuEdit.setMnemonic('E');\r

+            jMenuEdit.setVisible(false);\r
+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuEdit.add(getJMenuItemEditUndo());\r
             jMenuEdit.add(getJMenuItemEditRedo());\r
             jMenuEdit.addSeparator();\r
             jMenuEdit.add(getJMenuItemEditUndo());\r
             jMenuEdit.add(getJMenuItemEditRedo());\r
             jMenuEdit.addSeparator();\r

+\r

             jMenuEdit.add(getJMenuItemEditCut());\r
             jMenuEdit.add(getJMenuItemEditCopy());\r
             jMenuEdit.add(getJMenuItemEditPaste());\r
             jMenuEdit.add(getJMenuItemEditDelete());\r
             jMenuEdit.addSeparator();\r
             jMenuEdit.add(getJMenuItemEditCut());\r
             jMenuEdit.add(getJMenuItemEditCopy());\r
             jMenuEdit.add(getJMenuItemEditPaste());\r
             jMenuEdit.add(getJMenuItemEditDelete());\r
             jMenuEdit.addSeparator();\r

+\r

             jMenuEdit.add(getJMenuItemEditSelectAll());\r
             jMenuEdit.add(getJMenuItemEditFind());\r
             jMenuEdit.add(getJMenuItemEditFindNext());\r
             jMenuEdit.addSeparator();\r
             jMenuEdit.add(getJMenuItemEditSelectAll());\r
             jMenuEdit.add(getJMenuItemEditFind());\r
             jMenuEdit.add(getJMenuItemEditFindNext());\r
             jMenuEdit.addSeparator();\r

-            jMenuEdit.setVisible(false);\r

         }\r
         return jMenuEdit;\r
     }\r
         }\r
         return jMenuEdit;\r
     }\r


@@ -571,7 +594,6 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     private JScrollPane getJScrollPaneTree() {\r
         if (jScrollPaneTree == null) {\r
             jScrollPaneTree = new JScrollPane();\r
     private JScrollPane getJScrollPaneTree() {\r
         if (jScrollPaneTree == null) {\r
             jScrollPaneTree = new JScrollPane();\r

-            //jScrollPaneTree.setBounds(new java.awt.Rectangle(0, 1, 290, 545));\r

             jScrollPaneTree\r
                            .setPreferredSize(new java.awt.Dimension(\r
                                                                     DataType.MAIN_FRAME_TREE_PANEL_PREFERRED_SIZE_WIDTH,\r
             jScrollPaneTree\r
                            .setPreferredSize(new java.awt.Dimension(\r
                                                                     DataType.MAIN_FRAME_TREE_PANEL_PREFERRED_SIZE_WIDTH,\r


@@ -607,12 +629,19 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      **/\r
     private JMenu getJMenuHelp() {\r
         if (jMenuHelp == null) {\r
      **/\r
     private JMenu getJMenuHelp() {\r
         if (jMenuHelp == null) {\r

+            //\r
+            // Set jMenuHelp's attributes\r
+            //\r

             jMenuHelp = new JMenu();\r
             jMenuHelp.setText("Help");\r
             jMenuHelp = new JMenu();\r
             jMenuHelp.setText("Help");\r

+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuHelp.add(getJMenuItemHelpContents());\r
             jMenuHelp.add(getJMenuItemHelpIndex());\r
             jMenuHelp.add(getJMenuItemHelpSearch());\r
             jMenuHelp.add(getJMenuItemHelpContents());\r
             jMenuHelp.add(getJMenuItemHelpIndex());\r
             jMenuHelp.add(getJMenuItemHelpSearch());\r

-            //jMenuHelp.addSeparator();\r
+\r

             jMenuHelp.add(getJMenuItemHelpAbout());\r
         }\r
         return jMenuHelp;\r
             jMenuHelp.add(getJMenuItemHelpAbout());\r
         }\r
         return jMenuHelp;\r


@@ -646,82 +675,13 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             jMenuItemEditDelete.setMnemonic('D');\r
             jMenuItemEditDelete.addActionListener(this);\r
             //\r
             jMenuItemEditDelete.setMnemonic('D');\r
             jMenuItemEditDelete.addActionListener(this);\r
             //\r

-            //Disabled when no module is open\r
+            //Disabled first when no module is open\r

             //\r
             jMenuItemEditDelete.setEnabled(false);\r
         }\r
         return jMenuItemEditDelete;\r
     }\r
 \r
             //\r
             jMenuItemEditDelete.setEnabled(false);\r
         }\r
         return jMenuItemEditDelete;\r
     }\r
 \r

-    //    /**\r
-    //     This method initializes jPopupMenu \r
-    //     \r
-    //     @return javax.swing.JPopupMenu jPopupMenu\r
-    //     \r
-    //     **/\r
-    //    private JPopupMenu getJPopupMenu() {\r
-    //        if (jPopupMenu == null) {\r
-    //            jPopupMenu = new JPopupMenu();\r
-    //            //\r
-    //            //Add menu items of popup menu\r
-    //            //\r
-    //            jPopupMenu.add(getJMenuItemPopupAdd());\r
-    //            jPopupMenu.add(getJMenuItemPopupUpdate());\r
-    //            jPopupMenu.add(getJMenuItemPopupDelete());\r
-    //            jPopupMenu.setBorder(new BevelBorder(BevelBorder.RAISED));\r
-    //            jPopupMenu.addMouseListener(this);\r
-    //        }\r
-    //        return jPopupMenu;\r
-    //    }\r
-    //\r
-    //    /**\r
-    //     This method initializes jMenuItemPopupAdd \r
-    //     \r
-    //     @return javax.swing.JMenuItem jMenuItemPopupAdd\r
-    //     \r
-    //     **/\r
-    //    private JMenuItem getJMenuItemPopupAdd() {\r
-    //        if (jMenuItemPopupAdd == null) {\r
-    //            jMenuItemPopupAdd = new JMenuItem();\r
-    //            jMenuItemPopupAdd.setText("Add");\r
-    //            jMenuItemPopupAdd.addActionListener(this);\r
-    //            jMenuItemPopupAdd.setEnabled(false);\r
-    //        }\r
-    //        return jMenuItemPopupAdd;\r
-    //    }\r
-    //\r
-    //    /**\r
-    //     This method initializes jMenuItemPopupUpdate \r
-    //     \r
-    //     @return javax.swing.JMenuItem jMenuItemPopupUpdate\r
-    //     \r
-    //     **/\r
-    //    private JMenuItem getJMenuItemPopupUpdate() {\r
-    //        if (jMenuItemPopupUpdate == null) {\r
-    //            jMenuItemPopupUpdate = new JMenuItem();\r
-    //            jMenuItemPopupUpdate.setText("Update");\r
-    //            jMenuItemPopupUpdate.addActionListener(this);\r
-    //            jMenuItemPopupUpdate.setEnabled(false);\r
-    //        }\r
-    //        return jMenuItemPopupUpdate;\r
-    //    }\r
-    //\r
-    //    /**\r
-    //     This method initializes jMenuItemPopupDelete \r
-    //     \r
-    //     @return javax.swing.JMenuItem jMenuItemPopupDelete\r
-    //     \r
-    //     **/\r
-    //    private JMenuItem getJMenuItemPopupDelete() {\r
-    //        if (jMenuItemPopupDelete == null) {\r
-    //            jMenuItemPopupDelete = new JMenuItem();\r
-    //            jMenuItemPopupDelete.setText("Delete");\r
-    //            jMenuItemPopupDelete.addActionListener(this);\r
-    //            jMenuItemPopupDelete.setEnabled(false);\r
-    //        }\r
-    //        return jMenuItemPopupDelete;\r
-    //    }\r
-\r

     /**\r
      This method initializes jMenuFileNew \r
      \r
     /**\r
      This method initializes jMenuFileNew \r
      \r


@@ -781,15 +741,22 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      **/\r
     private JMenu getJMenuTools() {\r
         if (jMenuTools == null) {\r
      **/\r
     private JMenu getJMenuTools() {\r
         if (jMenuTools == null) {\r

+            //\r
+            // Set jMenuTools's attributes\r
+            //\r

             jMenuTools = new JMenu();\r
             jMenuTools.setText("Tools");\r
             jMenuTools.setMnemonic('T');\r
             jMenuTools = new JMenu();\r
             jMenuTools.setText("Tools");\r
             jMenuTools.setMnemonic('T');\r

+            jMenuTools.addMenuListener(this);\r
+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
             jMenuTools.addSeparator();\r
             jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
             jMenuTools.addSeparator();\r

+\r

             jMenuTools.add(getJMenuItemToolsClone());\r
             jMenuTools.add(getJMenuItemToolsClone());\r

-            //jMenuTools.addSeparator();\r

             jMenuTools.add(getJMenuItemToolsCodeScan());\r
             jMenuTools.add(getJMenuItemToolsCodeScan());\r

-            jMenuTools.addMenuListener(this);\r

         }\r
         return jMenuTools;\r
     }\r
         }\r
         return jMenuTools;\r
     }\r


@@ -803,25 +770,36 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      **/\r
     private JMenu getJMenuWindow() {\r
         if (jMenuWindow == null) {\r
      **/\r
     private JMenu getJMenuWindow() {\r
         if (jMenuWindow == null) {\r

+            //\r
+            // Set jMenuWindow's attribute\r
+            //\r

             jMenuWindow = new JMenu();\r
             jMenuWindow.setText("Window");\r
             jMenuWindow.setMnemonic('W');\r
             jMenuWindow = new JMenu();\r
             jMenuWindow.setText("Window");\r
             jMenuWindow.setMnemonic('W');\r

+            jMenuWindow.setVisible(false);\r
+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuWindow.add(getJMenuItemWindowDisplaySide());\r
             jMenuWindow.add(getJMenuItemWindowDisplayTopBottom());\r
             jMenuWindow.addSeparator();\r
             jMenuWindow.add(getJMenuItemWindowDisplaySide());\r
             jMenuWindow.add(getJMenuItemWindowDisplayTopBottom());\r
             jMenuWindow.addSeparator();\r

+\r

             jMenuWindow.add(getJMenuItemWindowTabView());\r
             jMenuWindow.addSeparator();\r
             jMenuWindow.add(getJMenuItemWindowTabView());\r
             jMenuWindow.addSeparator();\r

+\r

             jMenuWindow.add(getJMenuItemWindowSource());\r
             jMenuWindow.add(getJMenuItemWindowXML());\r
             jMenuWindow.addSeparator();\r
             jMenuWindow.add(getJMenuItemWindowSource());\r
             jMenuWindow.add(getJMenuItemWindowXML());\r
             jMenuWindow.addSeparator();\r

+\r

             jMenuWindow.add(getJMenuItemWindowPreferences());\r
             jMenuWindow.add(getJMenuItemWindowPreferences());\r

-            jMenuWindow.setVisible(false);\r

         }\r
         return jMenuWindow;\r
     }\r
 \r
     /**\r
         }\r
         return jMenuWindow;\r
     }\r
 \r
     /**\r

-     This method initializes jPanelOperation \r
+     This method initializes jPanelOperation\r
+     Reserved\r

      \r
      @return javax.swing.JPanel jPanelOperation\r
      \r
      \r
      @return javax.swing.JPanel jPanelOperation\r
      \r


@@ -839,7 +817,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This method initializes jButtonOk \r
+     This method initializes jButtonOk\r
+     Reserved\r

      \r
      @return javax.swing.JButton jButtonOk\r
      \r
      \r
      @return javax.swing.JButton jButtonOk\r
      \r


@@ -856,7 +835,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     This method initializes jButtonCancel \r
+     This method initializes jButtonCancel\r
+     Reserved\r

      \r
      @return javax.swing.JButton jButtonCancel\r
      \r
      \r
      @return javax.swing.JButton jButtonCancel\r
      \r


@@ -877,7 +857,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemFileOpen \r
      \r
      @return javax.swing.JMenuItem jMenuItemFileOpen\r
      This method initializes jMenuItemFileOpen \r
      \r
      @return javax.swing.JMenuItem jMenuItemFileOpen\r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFileOpen() {\r
         if (jMenuItemFileOpen == null) {\r
             jMenuItemFileOpen = new JMenuItem();\r
     private JMenuItem getJMenuItemFileOpen() {\r
         if (jMenuItemFileOpen == null) {\r
             jMenuItemFileOpen = new JMenuItem();\r


@@ -892,7 +873,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemFileCloseAll     \r
      \r
      @return javax.swing.JMenuItem jMenuItemFileOpen\r
      This method initializes jMenuItemFileCloseAll     \r
      \r
      @return javax.swing.JMenuItem jMenuItemFileOpen\r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFileCloseAll() {\r
         if (jMenuItemFileCloseAll == null) {\r
             jMenuItemFileCloseAll = new JMenuItem();\r
     private JMenuItem getJMenuItemFileCloseAll() {\r
         if (jMenuItemFileCloseAll == null) {\r
             jMenuItemFileCloseAll = new JMenuItem();\r


@@ -907,7 +889,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemFileSaveAll      \r
      \r
      @return javax.swing.JMenuItem jMenuItemFileSaveAll\r
      This method initializes jMenuItemFileSaveAll      \r
      \r
      @return javax.swing.JMenuItem jMenuItemFileSaveAll\r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFileSaveAll() {\r
         if (jMenuItemFileSaveAll == null) {\r
             jMenuItemFileSaveAll = new JMenuItem();\r
     private JMenuItem getJMenuItemFileSaveAll() {\r
         if (jMenuItemFileSaveAll == null) {\r
             jMenuItemFileSaveAll = new JMenuItem();\r


@@ -923,7 +906,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemFilePageSetup    \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemFilePageSetup    \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFilePageSetup() {\r
         if (jMenuItemFilePageSetup == null) {\r
             jMenuItemFilePageSetup = new JMenuItem();\r
     private JMenuItem getJMenuItemFilePageSetup() {\r
         if (jMenuItemFilePageSetup == null) {\r
             jMenuItemFilePageSetup = new JMenuItem();\r


@@ -940,7 +924,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemFilePrint        \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemFilePrint        \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFilePrint() {\r
         if (jMenuItemFilePrint == null) {\r
             jMenuItemFilePrint = new JMenuItem();\r
     private JMenuItem getJMenuItemFilePrint() {\r
         if (jMenuItemFilePrint == null) {\r
             jMenuItemFilePrint = new JMenuItem();\r


@@ -957,7 +942,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemFileImport       \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemFileImport       \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFileImport() {\r
         if (jMenuItemFileImport == null) {\r
             jMenuItemFileImport = new JMenuItem();\r
     private JMenuItem getJMenuItemFileImport() {\r
         if (jMenuItemFileImport == null) {\r
             jMenuItemFileImport = new JMenuItem();\r


@@ -971,10 +957,11 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jMenuItemFileProperties \r
-     *         \r
-     * @return javax.swing.JMenuItem   \r
-     */\r
+     This method initializes jMenuItemFileProperties   \r
+     \r
+     @return javax.swing.JMenuItem     \r
+     \r
+     **/\r

     private JMenuItem getJMenuItemFileProperties() {\r
         if (jMenuItemFileProperties == null) {\r
             jMenuItemFileProperties = new JMenuItem();\r
     private JMenuItem getJMenuItemFileProperties() {\r
         if (jMenuItemFileProperties == null) {\r
             jMenuItemFileProperties = new JMenuItem();\r


@@ -988,10 +975,11 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jMenuFileRecentFiles    \r
-     *         \r
-     * @return javax.swing.JMenu       \r
-     */\r
+     This method initializes jMenuFileRecentFiles      \r
+     \r
+     @return javax.swing.JMenu \r
+     \r
+     **/\r

     private JMenu getJMenuFileRecentFiles() {\r
         if (jMenuFileRecentFiles == null) {\r
             jMenuFileRecentFiles = new JMenu();\r
     private JMenu getJMenuFileRecentFiles() {\r
         if (jMenuFileRecentFiles == null) {\r
             jMenuFileRecentFiles = new JMenu();\r


@@ -1007,8 +995,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     /**\r
      This method initializes jMenuItemEditUndo \r
      \r
     /**\r
      This method initializes jMenuItemEditUndo \r
      \r

-     @return javax.swing.JMenuItem     \r
-     */\r
+     @return javax.swing.JMenuItem\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditUndo() {\r
         if (jMenuItemEditUndo == null) {\r
             jMenuItemEditUndo = new JMenuItem();\r
     private JMenuItem getJMenuItemEditUndo() {\r
         if (jMenuItemEditUndo == null) {\r
             jMenuItemEditUndo = new JMenuItem();\r


@@ -1024,7 +1013,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemEditRedo \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemEditRedo \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditRedo() {\r
         if (jMenuItemEditRedo == null) {\r
             jMenuItemEditRedo = new JMenuItem();\r
     private JMenuItem getJMenuItemEditRedo() {\r
         if (jMenuItemEditRedo == null) {\r
             jMenuItemEditRedo = new JMenuItem();\r


@@ -1040,7 +1030,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemEditCut  \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemEditCut  \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditCut() {\r
         if (jMenuItemEditCut == null) {\r
             jMenuItemEditCut = new JMenuItem();\r
     private JMenuItem getJMenuItemEditCut() {\r
         if (jMenuItemEditCut == null) {\r
             jMenuItemEditCut = new JMenuItem();\r


@@ -1056,7 +1047,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemEditCopy \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemEditCopy \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditCopy() {\r
         if (jMenuItemEditCopy == null) {\r
             jMenuItemEditCopy = new JMenuItem();\r
     private JMenuItem getJMenuItemEditCopy() {\r
         if (jMenuItemEditCopy == null) {\r
             jMenuItemEditCopy = new JMenuItem();\r


@@ -1072,7 +1064,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemEditPaste        \r
      \r
      return javax.swing.JMenuItem      \r
      This method initializes jMenuItemEditPaste        \r
      \r
      return javax.swing.JMenuItem      \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditPaste() {\r
         if (jMenuItemEditPaste == null) {\r
             jMenuItemEditPaste = new JMenuItem();\r
     private JMenuItem getJMenuItemEditPaste() {\r
         if (jMenuItemEditPaste == null) {\r
             jMenuItemEditPaste = new JMenuItem();\r


@@ -1088,7 +1081,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItem \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItem \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditSelectAll() {\r
         if (jMenuItemEditSelectAll == null) {\r
             jMenuItemEditSelectAll = new JMenuItem();\r
     private JMenuItem getJMenuItemEditSelectAll() {\r
         if (jMenuItemEditSelectAll == null) {\r
             jMenuItemEditSelectAll = new JMenuItem();\r


@@ -1104,7 +1098,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      This method initializes jMenuItemEditFind \r
      \r
      @return javax.swing.JMenuItem     \r
      This method initializes jMenuItemEditFind \r
      \r
      @return javax.swing.JMenuItem     \r

-     */\r
+     \r
+     **/\r

     private JMenuItem getJMenuItemEditFind() {\r
         if (jMenuItemEditFind == null) {\r
             jMenuItemEditFind = new JMenuItem();\r
     private JMenuItem getJMenuItemEditFind() {\r
         if (jMenuItemEditFind == null) {\r
             jMenuItemEditFind = new JMenuItem();\r


@@ -1121,7 +1116,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemEditFindNext() {\r
         if (jMenuItemEditFindNext == null) {\r
             jMenuItemEditFindNext = new JMenuItem();\r
     private JMenuItem getJMenuItemEditFindNext() {\r
         if (jMenuItemEditFindNext == null) {\r
             jMenuItemEditFindNext = new JMenuItem();\r


@@ -1138,17 +1133,24 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenu \r
      \r
      \r
      @return javax.swing.JMenu \r
      \r

-     */\r
+     **/\r

     private JMenu getJMenuView() {\r
         if (jMenuView == null) {\r
     private JMenu getJMenuView() {\r
         if (jMenuView == null) {\r

+            //\r
+            // Set jMenuView's attributes\r
+            //\r

             jMenuView = new JMenu();\r
             jMenuView.setText("View");\r
             jMenuView.setMnemonic('V');\r
             jMenuView = new JMenu();\r
             jMenuView.setText("View");\r
             jMenuView.setMnemonic('V');\r

+            jMenuView.setVisible(false);\r
+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuView.add(getJMenuViewToolbars());\r
             jMenuView.add(getJMenuItemViewAdvanced());\r
             jMenuView.add(getJMenuItemViewStandard());\r
             jMenuView.add(getJMenuItemViewXML());\r
             jMenuView.add(getJMenuViewToolbars());\r
             jMenuView.add(getJMenuItemViewAdvanced());\r
             jMenuView.add(getJMenuItemViewStandard());\r
             jMenuView.add(getJMenuItemViewXML());\r

-            jMenuView.setVisible(false);\r

         }\r
         return jMenuView;\r
     }\r
         }\r
         return jMenuView;\r
     }\r


@@ -1158,12 +1160,13 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenu \r
      \r
      \r
      @return javax.swing.JMenu \r
      \r

-     */\r
+     **/\r

     private JMenu getJMenuViewToolbars() {\r
         if (jMenuViewToolbars == null) {\r
             jMenuViewToolbars = new JMenu();\r
             jMenuViewToolbars.setText("Toolbars");\r
             jMenuViewToolbars.setMnemonic('T');\r
     private JMenu getJMenuViewToolbars() {\r
         if (jMenuViewToolbars == null) {\r
             jMenuViewToolbars = new JMenu();\r
             jMenuViewToolbars.setText("Toolbars");\r
             jMenuViewToolbars.setMnemonic('T');\r

+\r

             jMenuViewToolbars.add(getJCheckBoxMenuItemViewToolbarsFile());\r
             jMenuViewToolbars.add(getJCheckBoxMenuItemViewToolbarsEdit());\r
             jMenuViewToolbars.add(getJCheckBoxMenuItemViewToolbarsWindow());\r
             jMenuViewToolbars.add(getJCheckBoxMenuItemViewToolbarsFile());\r
             jMenuViewToolbars.add(getJCheckBoxMenuItemViewToolbarsEdit());\r
             jMenuViewToolbars.add(getJCheckBoxMenuItemViewToolbarsWindow());\r


@@ -1176,7 +1179,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r

-     */\r
+     **/\r

     private JCheckBoxMenuItem getJCheckBoxMenuItemViewToolbarsFile() {\r
         if (jCheckBoxMenuItemViewToolbarsFile == null) {\r
             jCheckBoxMenuItemViewToolbarsFile = new JCheckBoxMenuItem();\r
     private JCheckBoxMenuItem getJCheckBoxMenuItemViewToolbarsFile() {\r
         if (jCheckBoxMenuItemViewToolbarsFile == null) {\r
             jCheckBoxMenuItemViewToolbarsFile = new JCheckBoxMenuItem();\r


@@ -1192,7 +1195,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r

-     */\r
+     **/\r

     private JCheckBoxMenuItem getJCheckBoxMenuItemViewToolbarsEdit() {\r
         if (jCheckBoxMenuItemViewToolbarsEdit == null) {\r
             jCheckBoxMenuItemViewToolbarsEdit = new JCheckBoxMenuItem();\r
     private JCheckBoxMenuItem getJCheckBoxMenuItemViewToolbarsEdit() {\r
         if (jCheckBoxMenuItemViewToolbarsEdit == null) {\r
             jCheckBoxMenuItemViewToolbarsEdit = new JCheckBoxMenuItem();\r


@@ -1208,7 +1211,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r

-     */\r
+     **/\r

     private JCheckBoxMenuItem getJCheckBoxMenuItemViewToolbarsWindow() {\r
         if (jCheckBoxMenuItemViewToolbarsWindow == null) {\r
             jCheckBoxMenuItemViewToolbarsWindow = new JCheckBoxMenuItem();\r
     private JCheckBoxMenuItem getJCheckBoxMenuItemViewToolbarsWindow() {\r
         if (jCheckBoxMenuItemViewToolbarsWindow == null) {\r
             jCheckBoxMenuItemViewToolbarsWindow = new JCheckBoxMenuItem();\r


@@ -1224,7 +1227,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemViewStandard() {\r
         if (jMenuItemViewStandard == null) {\r
             jMenuItemViewStandard = new JMenuItem();\r
     private JMenuItem getJMenuItemViewStandard() {\r
         if (jMenuItemViewStandard == null) {\r
             jMenuItemViewStandard = new JMenuItem();\r


@@ -1241,7 +1244,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemViewAdvanced() {\r
         if (jMenuItemViewAdvanced == null) {\r
             jMenuItemViewAdvanced = new JMenuItem();\r
     private JMenuItem getJMenuItemViewAdvanced() {\r
         if (jMenuItemViewAdvanced == null) {\r
             jMenuItemViewAdvanced = new JMenuItem();\r


@@ -1258,21 +1261,29 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenu \r
      \r
      \r
      @return javax.swing.JMenu \r
      \r

-     */\r
+     **/\r

     private JMenu getJMenuProject() {\r
         if (jMenuProject == null) {\r
     private JMenu getJMenuProject() {\r
         if (jMenuProject == null) {\r

+            //\r
+            // Set jMenuProject's attributes\r
+            //\r

             jMenuProject = new JMenu();\r
             jMenuProject.setText("Project");\r
             jMenuProject.setMnemonic('P');\r
             jMenuProject = new JMenu();\r
             jMenuProject.setText("Project");\r
             jMenuProject.setMnemonic('P');\r

+\r
+            //\r
+            // Add sub menu items\r
+            //\r

             jMenuProject.add(getJMenuItemProjectAdmin());\r
             jMenuProject.add(getJMenuItemProjectAdmin());\r

-            //jMenuProject.addSeparator();\r
+\r

             jMenuProject.add(getJMenuItemProjectChangeWorkspace());\r
             jMenuProject.addSeparator();\r
             jMenuProject.add(getJMenuItemProjectChangeWorkspace());\r
             jMenuProject.addSeparator();\r

+\r

             jMenuProject.add(getJMenuItemProjectCreateFar());\r
             jMenuProject.add(getJMenuItemProjectInstallFar());\r
             jMenuProject.add(getJMenuItemProjectUpdateFar());\r
             jMenuProject.add(getJMenuItemProjectRemoveFar());\r
             jMenuProject.add(getJMenuItemProjectCreateFar());\r
             jMenuProject.add(getJMenuItemProjectInstallFar());\r
             jMenuProject.add(getJMenuItemProjectUpdateFar());\r
             jMenuProject.add(getJMenuItemProjectRemoveFar());\r

-            //jMenuProject.addSeparator();\r
+\r

             jMenuProject.add(getJMenuProjectBuildTargets());\r
         }\r
         return jMenuProject;\r
             jMenuProject.add(getJMenuProjectBuildTargets());\r
         }\r
         return jMenuProject;\r


@@ -1283,7 +1294,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemProjectAdmin() {\r
         if (jMenuItemProjectAdmin == null) {\r
             jMenuItemProjectAdmin = new JMenuItem();\r
     private JMenuItem getJMenuItemProjectAdmin() {\r
         if (jMenuItemProjectAdmin == null) {\r
             jMenuItemProjectAdmin = new JMenuItem();\r


@@ -1301,7 +1312,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemProjectChangeWorkspace() {\r
         if (jMenuItemProjectChangeWorkspace == null) {\r
             jMenuItemProjectChangeWorkspace = new JMenuItem();\r
     private JMenuItem getJMenuItemProjectChangeWorkspace() {\r
         if (jMenuItemProjectChangeWorkspace == null) {\r
             jMenuItemProjectChangeWorkspace = new JMenuItem();\r


@@ -1318,15 +1329,16 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenu \r
      \r
      \r
      @return javax.swing.JMenu \r
      \r

-     */\r
+     **/\r

     private JMenu getJMenuProjectBuildTargets() {\r
         if (jMenuProjectBuildTargets == null) {\r
             jMenuProjectBuildTargets = new JMenu();\r
             jMenuProjectBuildTargets.setText("Build Targets");\r
             jMenuProjectBuildTargets.setMnemonic('T');\r
     private JMenu getJMenuProjectBuildTargets() {\r
         if (jMenuProjectBuildTargets == null) {\r
             jMenuProjectBuildTargets = new JMenu();\r
             jMenuProjectBuildTargets.setText("Build Targets");\r
             jMenuProjectBuildTargets.setMnemonic('T');\r

+            jMenuProjectBuildTargets.setVisible(false);\r
+\r

             jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsDebug());\r
             jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsRelease());\r
             jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsDebug());\r
             jMenuProjectBuildTargets.add(getJCheckBoxMenuItemProjectBuildTargetsRelease());\r

-            jMenuProjectBuildTargets.setVisible(false);\r

         }\r
         return jMenuProjectBuildTargets;\r
     }\r
         }\r
         return jMenuProjectBuildTargets;\r
     }\r


@@ -1336,7 +1348,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r

-     */\r
+     **/\r

     private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsDebug() {\r
         if (jCheckBoxMenuItemProjectBuildTargetsDebug == null) {\r
             jCheckBoxMenuItemProjectBuildTargetsDebug = new JCheckBoxMenuItem();\r
     private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsDebug() {\r
         if (jCheckBoxMenuItemProjectBuildTargetsDebug == null) {\r
             jCheckBoxMenuItemProjectBuildTargetsDebug = new JCheckBoxMenuItem();\r


@@ -1351,7 +1363,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r
      \r
      @return javax.swing.JCheckBoxMenuItem     \r
      \r

-     */\r
+     **/\r

     private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsRelease() {\r
         if (jCheckBoxMenuItemProjectBuildTargetsRelease == null) {\r
             jCheckBoxMenuItemProjectBuildTargetsRelease = new JCheckBoxMenuItem();\r
     private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsRelease() {\r
         if (jCheckBoxMenuItemProjectBuildTargetsRelease == null) {\r
             jCheckBoxMenuItemProjectBuildTargetsRelease = new JCheckBoxMenuItem();\r


@@ -1366,7 +1378,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemToolsToolChainConfiguration() {\r
         if (jMenuItemToolsToolChainConfiguration == null) {\r
             jMenuItemToolsToolChainConfiguration = new JMenuItem();\r
     private JMenuItem getJMenuItemToolsToolChainConfiguration() {\r
         if (jMenuItemToolsToolChainConfiguration == null) {\r
             jMenuItemToolsToolChainConfiguration = new JMenuItem();\r


@@ -1382,7 +1394,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemToolsClone() {\r
         if (jMenuItemToolsClone == null) {\r
             jMenuItemToolsClone = new JMenuItem();\r
     private JMenuItem getJMenuItemToolsClone() {\r
         if (jMenuItemToolsClone == null) {\r
             jMenuItemToolsClone = new JMenuItem();\r


@@ -1399,7 +1411,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemToolsCodeScan() {\r
         if (jMenuItemToolsCodeScan == null) {\r
             jMenuItemToolsCodeScan = new JMenuItem();\r
     private JMenuItem getJMenuItemToolsCodeScan() {\r
         if (jMenuItemToolsCodeScan == null) {\r
             jMenuItemToolsCodeScan = new JMenuItem();\r


@@ -1417,7 +1429,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemWindowDisplaySide() {\r
         if (jMenuItemWindowDisplaySide == null) {\r
             jMenuItemWindowDisplaySide = new JMenuItem();\r
     private JMenuItem getJMenuItemWindowDisplaySide() {\r
         if (jMenuItemWindowDisplaySide == null) {\r
             jMenuItemWindowDisplaySide = new JMenuItem();\r


@@ -1434,7 +1446,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemWindowDisplayTopBottom() {\r
         if (jMenuItemWindowDisplayTopBottom == null) {\r
             jMenuItemWindowDisplayTopBottom = new JMenuItem();\r
     private JMenuItem getJMenuItemWindowDisplayTopBottom() {\r
         if (jMenuItemWindowDisplayTopBottom == null) {\r
             jMenuItemWindowDisplayTopBottom = new JMenuItem();\r


@@ -1451,7 +1463,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemViewXML() {\r
         if (jMenuItemViewXML == null) {\r
             jMenuItemViewXML = new JMenuItem();\r
     private JMenuItem getJMenuItemViewXML() {\r
         if (jMenuItemViewXML == null) {\r
             jMenuItemViewXML = new JMenuItem();\r


@@ -1468,7 +1480,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemWindowTabView() {\r
         if (jMenuItemWindowTabView == null) {\r
             jMenuItemWindowTabView = new JMenuItem();\r
     private JMenuItem getJMenuItemWindowTabView() {\r
         if (jMenuItemWindowTabView == null) {\r
             jMenuItemWindowTabView = new JMenuItem();\r


@@ -1485,7 +1497,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemWindowSource() {\r
         if (jMenuItemWindowSource == null) {\r
             jMenuItemWindowSource = new JMenuItem();\r
     private JMenuItem getJMenuItemWindowSource() {\r
         if (jMenuItemWindowSource == null) {\r
             jMenuItemWindowSource = new JMenuItem();\r


@@ -1502,7 +1514,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemWindowXML() {\r
         if (jMenuItemWindowXML == null) {\r
             jMenuItemWindowXML = new JMenuItem();\r
     private JMenuItem getJMenuItemWindowXML() {\r
         if (jMenuItemWindowXML == null) {\r
             jMenuItemWindowXML = new JMenuItem();\r


@@ -1519,7 +1531,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemWindowPreferences() {\r
         if (jMenuItemWindowPreferences == null) {\r
             jMenuItemWindowPreferences = new JMenuItem();\r
     private JMenuItem getJMenuItemWindowPreferences() {\r
         if (jMenuItemWindowPreferences == null) {\r
             jMenuItemWindowPreferences = new JMenuItem();\r


@@ -1536,7 +1548,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemHelpContents() {\r
         if (jMenuItemHelpContents == null) {\r
             jMenuItemHelpContents = new JMenuItem();\r
     private JMenuItem getJMenuItemHelpContents() {\r
         if (jMenuItemHelpContents == null) {\r
             jMenuItemHelpContents = new JMenuItem();\r


@@ -1554,7 +1566,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      @return javax.swing.JMenuItem     \r
      \r
      \r
      @return javax.swing.JMenuItem     \r
      \r

-     */\r
+     **/\r

     private JMenuItem getJMenuItemHelpIndex() {\r
         if (jMenuItemHelpIndex == null) {\r
             jMenuItemHelpIndex = new JMenuItem();\r
     private JMenuItem getJMenuItemHelpIndex() {\r
         if (jMenuItemHelpIndex == null) {\r
             jMenuItemHelpIndex = new JMenuItem();\r


@@ -1585,30 +1597,6 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         return jMenuItemHelpSearch;\r
     }\r
 \r
         return jMenuItemHelpSearch;\r
     }\r
 \r

-    /**\r
-     * This method initializes jToolBar        \r
-     *         \r
-     * @return javax.swing.JToolBar    \r
-     */\r
-    // private JToolBar getJToolBarFile() {\r
-    //         if (jToolBarFile == null) {\r
-    //                 jToolBarFile = new JToolBar();\r
-    //                 jToolBarFile.setFloatable(false);\r
-    //         }\r
-    //         return jToolBarFile;\r
-    // }\r
-    /**\r
-     * This method initializes jToolBarEdit    \r
-     *         \r
-     * @return javax.swing.JToolBar    \r
-     */\r
-    // private JToolBar getJToolBarEdit() {\r
-    //         if (jToolBarEdit == null) {\r
-    //                 jToolBarEdit = new JToolBar();\r
-    //                 jToolBarEdit.setFloatable(false);\r
-    //         }\r
-    //         return jToolBarEdit;\r
-    // }\r

     /**\r
      * This method initializes jMenuItemToolsInstallPackage    \r
      *         \r
     /**\r
      * This method initializes jMenuItemToolsInstallPackage    \r
      *         \r


@@ -1791,50 +1779,19 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectCreateFar) {\r
         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectCreateFar) {\r

-            CreateStepOne cso = new CreateStepOne(this, true);\r
-            int result = cso.showDialog();\r
-            if (result == DataType.RETURN_TYPE_OK) {\r
-                String strReturn = "Create Far Done!";\r
-                JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
-                                              JOptionPane.INFORMATION_MESSAGE);\r
-            }\r
-            cso.dispose();\r
+            createFar();\r

         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectInstallFar) {\r
         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectInstallFar) {\r

-            InstallStepOne iso = new InstallStepOne(this, true);\r
-            int result = iso.showDialog();\r
-            if (result == DataType.RETURN_TYPE_OK) {\r
-                String strReturn = "<html>Install Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
-                JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
-                                              JOptionPane.INFORMATION_MESSAGE);\r
-                this.closeAll();\r
-            }\r
-            iso.dispose();\r
+            installFar();\r

         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectRemoveFar) {\r
         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectRemoveFar) {\r

-            DeleteStepOne dso = new DeleteStepOne(this, true);\r
-            int result = dso.showDialog();\r
-            if (result == DataType.RETURN_TYPE_OK) {\r
-                String strReturn = "<html>Delete Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
-                JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
-                                              JOptionPane.INFORMATION_MESSAGE);\r
-                this.closeAll();\r
-            }\r
-            dso.dispose();\r
+            removeFar();\r

         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectUpdateFar) {\r
         }\r
 \r
         if (arg0.getSource() == jMenuItemProjectUpdateFar) {\r

-            UpdateStepOne uso = new UpdateStepOne(this, true);\r
-            int result = uso.showDialog();\r
-            if (result == DataType.RETURN_TYPE_OK) {\r
-                String strReturn = "<html>Update Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
-                JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
-                                              JOptionPane.INFORMATION_MESSAGE);\r
-                this.closeAll();\r
-            }\r
-            uso.dispose();\r
+            updateFar();\r

         }\r
 \r
         if (arg0.getSource() == jMenuItemToolsClone) {\r
         }\r
 \r
         if (arg0.getSource() == jMenuItemToolsClone) {\r


@@ -1859,10 +1816,14 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      \r
      **/\r
     private void makeEmptyTree() {\r
      \r
      **/\r
     private void makeEmptyTree() {\r

+        //\r

         // Make root\r
         // Make root\r

+        //\r

         dmtnRoot = new IDefaultMutableTreeNode("WORKSPACE", IDefaultMutableTreeNode.WORKSPACE, -1);\r
 \r
         dmtnRoot = new IDefaultMutableTreeNode("WORKSPACE", IDefaultMutableTreeNode.WORKSPACE, -1);\r
 \r

+        //\r

         // Make Module Description\r
         // Make Module Description\r

+        //\r

         dmtnModuleDescription = new IDefaultMutableTreeNode("ModuleDescription", IDefaultMutableTreeNode.MODULE, -1);\r
 \r
         //\r
         dmtnModuleDescription = new IDefaultMutableTreeNode("ModuleDescription", IDefaultMutableTreeNode.MODULE, -1);\r
 \r
         //\r


@@ -1883,7 +1844,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                 dmtnModulePackageModule = new IDefaultMutableTreeNode("Module",\r
                                                                       IDefaultMutableTreeNode.MODULE_PACKAGE_MODULE,\r
                                                                       false, this.vPackageList.elementAt(index));\r
                 dmtnModulePackageModule = new IDefaultMutableTreeNode("Module",\r
                                                                       IDefaultMutableTreeNode.MODULE_PACKAGE_MODULE,\r
                                                                       false, this.vPackageList.elementAt(index));\r

-\r
+                //\r
+                // And then add each module in its package\r
+                //\r

                 Vector<ModuleIdentification> vModule = wt.getAllModules(this.vPackageList.elementAt(index));\r
                 for (int indexJ = 0; indexJ < vModule.size(); indexJ++) {\r
                     if (vModule.get(indexJ).isLibrary()) {\r
                 Vector<ModuleIdentification> vModule = wt.getAllModules(this.vPackageList.elementAt(index));\r
                 for (int indexJ = 0; indexJ < vModule.size(); indexJ++) {\r
                     if (vModule.get(indexJ).isLibrary()) {\r


@@ -1907,15 +1870,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             }\r
         }\r
 \r
             }\r
         }\r
 \r

-        //                if (this.vModuleList.size() > 0) {\r
-        //                    for (int index = 0; index < this.vModuleList.size(); index++) {\r
-        //                        dmtnModuleDescription.add(new IDefaultMutableTreeNode(this.vModuleList.elementAt(index).getName(),\r
-        //                                                                              IDefaultMutableTreeNode.MSA_HEADER, false,\r
-        //                                                                              this.vModuleList.elementAt(index)));\r
-        //                    }\r
-        //                }\r
-\r
+        //\r

         // Make Package Description\r
         // Make Package Description\r

+        //\r

         dmtnPackageDescription = new IDefaultMutableTreeNode("PackageDescription", IDefaultMutableTreeNode.PACKAGE, -1);\r
         if (this.vPackageList.size() > 0) {\r
             for (int index = 0; index < this.vPackageList.size(); index++) {\r
         dmtnPackageDescription = new IDefaultMutableTreeNode("PackageDescription", IDefaultMutableTreeNode.PACKAGE, -1);\r
         if (this.vPackageList.size() > 0) {\r
             for (int index = 0; index < this.vPackageList.size(); index++) {\r


@@ -1925,7 +1882,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             }\r
         }\r
 \r
             }\r
         }\r
 \r

+        //\r

         // Make Platform Description\r
         // Make Platform Description\r

+        //\r

         dmtnPlatformDescription = new IDefaultMutableTreeNode("PlatformDescription", IDefaultMutableTreeNode.PLATFORM,\r
                                                               -1);\r
         if (this.vPlatformList.size() > 0) {\r
         dmtnPlatformDescription = new IDefaultMutableTreeNode("PlatformDescription", IDefaultMutableTreeNode.PLATFORM,\r
                                                               -1);\r
         if (this.vPlatformList.size() > 0) {\r


@@ -1936,6 +1895,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             }\r
         }\r
 \r
             }\r
         }\r
 \r

+        //\r
+        // Add sub nodes to root node\r
+        //\r

         dmtnRoot.add(dmtnModuleDescription);\r
         dmtnRoot.add(dmtnPackageDescription);\r
         dmtnRoot.add(dmtnPlatformDescription);\r
         dmtnRoot.add(dmtnModuleDescription);\r
         dmtnRoot.add(dmtnPackageDescription);\r
         dmtnRoot.add(dmtnPlatformDescription);\r


@@ -3069,7 +3031,9 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             this.saveAll();\r
         }\r
         if (result == JOptionPane.NO_OPTION) {\r
             this.saveAll();\r
         }\r
         if (result == JOptionPane.NO_OPTION) {\r

+            //\r

             // Do nothing\r
             // Do nothing\r

+            //\r

         }\r
         if (result == JOptionPane.CANCEL_OPTION) {\r
             return;\r
         }\r
         if (result == JOptionPane.CANCEL_OPTION) {\r
             return;\r


@@ -3181,6 +3145,69 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         sw.dispose();\r
     }\r
 \r
         sw.dispose();\r
     }\r
 \r

+    /**\r
+     To create a Far file from current workspace\r
+     \r
+     **/\r
+    private void createFar() {\r
+        CreateStepOne cso = new CreateStepOne(this, true);\r
+        int result = cso.showDialog();\r
+        if (result == DataType.RETURN_TYPE_OK) {\r
+            String strReturn = "Create Far Done!";\r
+            JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
+                                          JOptionPane.INFORMATION_MESSAGE);\r
+        }\r
+        cso.dispose();\r
+    }\r
+\r
+    /**\r
+     To install a Far file to current workspace\r
+     \r
+     **/\r
+    private void installFar() {\r
+        InstallStepOne iso = new InstallStepOne(this, true);\r
+        int result = iso.showDialog();\r
+        if (result == DataType.RETURN_TYPE_OK) {\r
+            String strReturn = "<html>Install Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
+            JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
+                                          JOptionPane.INFORMATION_MESSAGE);\r
+            this.closeAll();\r
+        }\r
+        iso.dispose();\r
+    }\r
+\r
+    /**\r
+     To remove a Far's items from current workspace\r
+     \r
+     **/\r
+    private void removeFar() {\r
+        DeleteStepOne dso = new DeleteStepOne(this, true);\r
+        int result = dso.showDialog();\r
+        if (result == DataType.RETURN_TYPE_OK) {\r
+            String strReturn = "<html>Delete Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
+            JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
+                                          JOptionPane.INFORMATION_MESSAGE);\r
+            this.closeAll();\r
+        }\r
+        dso.dispose();\r
+    }\r
+\r
+    /**\r
+     To update an existing Far file\r
+     \r
+     **/\r
+    private void updateFar() {\r
+        UpdateStepOne uso = new UpdateStepOne(this, true);\r
+        int result = uso.showDialog();\r
+        if (result == DataType.RETURN_TYPE_OK) {\r
+            String strReturn = "<html>Update Far Done! <br>The WORKSPACE will be refreshed!</html>";\r
+            JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
+                                          JOptionPane.INFORMATION_MESSAGE);\r
+            this.closeAll();\r
+        }\r
+        uso.dispose();\r
+    }\r
+\r

     /**\r
      Show Tool Chain Configuration Dialog to setup Tool Chain\r
      \r
     /**\r
      Show Tool Chain Configuration Dialog to setup Tool Chain\r
      \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
index 22367795ecfe168a3982e1b6d122d8c00652d685..5525b0a867ac9b783c46c01e9309d4147e0263ee 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataType.java
@@ -232,4 +232,9 @@ public class DataType {
     public static final String MODULE_TYPE_LIBRARY = "Library";\r
 \r
     public static final String MODULE_TYPE_MODULE = "Module";\r
     public static final String MODULE_TYPE_LIBRARY = "Library";\r
 \r
     public static final String MODULE_TYPE_MODULE = "Module";\r

+    \r
+    //\r
+    // Hex String Header\r
+    //\r
+    public static final String HEX_STRING_HEADER = "0x";\r

 }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java
index aeff9ac2c627228514e2a39669aad9964a8b5f36..d36f258dc1ddae9532a8e17e77c96e1a9a689ae4 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/DataValidation.java
@@ -309,7 +309,7 @@ public class DataValidation {
      \r
      **/\r
     public static boolean isHexWordArrayType(String arg0) {\r
      \r
      **/\r
     public static boolean isHexWordArrayType(String arg0) {\r

-        return arg0.length() <=6 && isMatch("((\\s)*0x([a-fA-F0-9]){4}(,)?(\\s)*)+", arg0);\r
+        return arg0.length() >=6 && isMatch("((\\s)*0x([a-fA-F0-9]){4}(,)?(\\s)*)+", arg0);\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java
index e28252239fd4a001c7bcc498706252139ba0c2b9..13e6786ca702611394dd8261c1b5ef93d5f697b7 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/SaveFile.java
@@ -228,6 +228,7 @@ public class SaveFile {
         //Save the file\r
         //\r
         msaDoc.save(f, options);\r
         //Save the file\r
         //\r
         msaDoc.save(f, options);\r

+        cursor.dispose();\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -262,6 +263,7 @@ public class SaveFile {
         //Save the file\r
         //\r
         spdDoc.save(f, options);\r
         //Save the file\r
         //\r
         spdDoc.save(f, options);\r

+        cursor.dispose();\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -296,6 +298,7 @@ public class SaveFile {
         //Save the file\r
         //\r
         fpdDoc.save(f, options);\r
         //Save the file\r
         //\r
         fpdDoc.save(f, options);\r

+        cursor.dispose();\r

     }\r
 \r
     /**\r
     }\r
 \r
     /**\r


@@ -326,5 +329,6 @@ public class SaveFile {
         //Save the file\r
         //\r
         dbDoc.save(f, options);\r
         //Save the file\r
         //\r
         dbDoc.save(f, options);\r

+        cursor.dispose();\r

     }\r
 }\r
     }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
index 7cb2e9d526537b3062889d6ccca7911f91db6a98..d5d16b8d651d496d8ff6e1c7acddbf60f457552f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Tools.java
@@ -38,35 +38,6 @@ public class Tools {
     //\r
     public static String dirForNewSpd = null;\r
 \r
     //\r
     public static String dirForNewSpd = null;\r
 \r

-    /**\r
-     Used for test\r
-     \r
-     @param args\r
-     \r
-     **/\r
-    public static void main(String[] args) {\r
-        System.out.println(getCurrentDateTime());\r
-        //        Vector<String> v = new Vector<String>();\r
-        //        Vector<String> v1 = new Vector<String>();\r
-        //        \r
-        //        v.addElement("CAC");\r
-        //        v1.addElement("1111");\r
-        //        v.addElement("1AC");\r
-        //        v1.addElement("2222");\r
-        //        v.addElement("ABC");\r
-        //        v1.addElement("3333");\r
-        //        v.addElement("0C");\r
-        //        v1.addElement("4444");\r
-        //        v.addElement("AAC");\r
-        //        v1.addElement("5555");\r
-        //        Vector<Integer> vs = new Vector<Integer>();\r
-        //        vs = Tools.getVectorSortSequence(v, DataType.Sort_Type_Ascending);\r
-        //        Tools.sortVectorString(v1, Tools.getVectorSortSequence(v, DataType.Sort_Type_Ascending));\r
-        //        \r
-        //        Tools.sortVectorString(v, DataType.Sort_Type_Ascending);\r
-        //        Tools.sortVectorString(v, DataType.Sort_Type_Descending);\r
-    }\r
-\r

     /**\r
      Get current date and time and format it as "yyyy-MM-dd HH:mm"\r
      \r
     /**\r
      Get current date and time and format it as "yyyy-MM-dd HH:mm"\r
      \r


@@ -407,4 +378,83 @@ public class Tools {
 \r
         return strReturn;\r
     }\r
 \r
         return strReturn;\r
     }\r

+    \r
+    public static String convertUnicodeHexStringToString(String str) {\r
+        //\r
+        // Handle if str is null or empty\r
+        //\r
+        if (str == null) {\r
+            return "";\r
+        }\r
+        if (str.equals("")) {\r
+            return "";\r
+        }\r
+\r
+        String returnString = "";\r
+        String[] strArray = str.split(" ");\r
+        for (int index = 0; index < strArray.length; index++) {\r
+            String s = strArray[index];\r
+            if (s.length() == 6 && s.indexOf(DataType.HEX_STRING_HEADER) == 0) {\r
+                s = s.substring(DataType.HEX_STRING_HEADER.length());\r
+            } else {\r
+                Log.err("convertUnicodeHexStringToString", "Wrong input string: " + str);\r
+                continue;\r
+            }\r
+            //\r
+            // Change hex to dec\r
+            //\r
+            int dec = Integer.parseInt(s, 16);\r
+            \r
+            returnString = returnString + (char)(dec);\r
+        }\r
+        return returnString;\r
+    }\r
+\r
+    /**\r
+     Convert input string to unicode hex string\r
+     \r
+     @param str input string\r
+     @return unicode hex string\r
+     \r
+     **/\r
+    public static String convertStringToUnicodeHexString(String str) {\r
+        //\r
+        // Handle if str is null or empty\r
+        //\r
+        if (str == null) {\r
+            return "";\r
+        }\r
+        if (str.equals("")) {\r
+            return "";\r
+        }\r
+\r
+        //\r
+        // convert string to hex string\r
+        //\r
+        String hexString = "";\r
+        for (int index = 0; index < str.length(); index++) {\r
+            int codePoint = str.codePointAt(index);\r
+            String s = Integer.toHexString(codePoint);\r
+            //\r
+            // Make the string to four length\r
+            //\r
+            if (s.length() == 3) {\r
+                s = "0" + s;\r
+            } else if (s.length() == 2) {\r
+                s = "00" + s;\r
+            } else if (s.length() == 1) {\r
+                s = "000" + s;\r
+            }\r
+\r
+            //\r
+            // Add the string to return hex string\r
+            //\r
+            hexString = hexString + DataType.HEX_STRING_HEADER + s + " ";\r
+        }\r
+\r
+        //\r
+        // return hex string\r
+        //\r
+        return hexString.trim();\r
+    }\r

 }\r
 }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
index ac16e2b31fca59b975686e5d1d4bd438205b9986..ed2f5aa0e1ed5ef50999f702ad9e6d7934680439 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleVariables.java
@@ -221,7 +221,7 @@ public class ModuleVariables extends IInternalFrame {
         if (this.variables != null) {\r
             if (this.variables.getVariableList().size() > 0) {\r
                 for (int index = 0; index < this.variables.getVariableList().size(); index++) {\r
         if (this.variables != null) {\r
             if (this.variables.getVariableList().size() > 0) {\r
                 for (int index = 0; index < this.variables.getVariableList().size(); index++) {\r

-                    String arg0 = variables.getVariableList().get(index).getVariableName();\r
+                    String arg0 = Tools.convertUnicodeHexStringToString(variables.getVariableList().get(index).getVariableName());\r

                     String arg1 = variables.getVariableList().get(index).getGuidCName();\r
                     String arg2 = null;\r
                     if (variables.getVariableList().get(index).getUsage() != null) {\r
                     String arg1 = variables.getVariableList().get(index).getGuidCName();\r
                     String arg2 = null;\r
                     if (variables.getVariableList().get(index).getUsage() != null) {\r


@@ -376,7 +376,7 @@ public class ModuleVariables extends IInternalFrame {
                 for (int index = 0; index < count; index++) {\r
                     Variable p = Variable.Factory.newInstance();\r
                     if (!isEmpty(vid.getVariables(index).getName())) {\r
                 for (int index = 0; index < count; index++) {\r
                     Variable p = Variable.Factory.newInstance();\r
                     if (!isEmpty(vid.getVariables(index).getName())) {\r

-                        p.setVariableName(vid.getVariables(index).getName());\r
+                        p.setVariableName(Tools.convertStringToUnicodeHexString(vid.getVariables(index).getName()));\r

                     }\r
                     if (!isEmpty(vid.getVariables(index).getGuid())) {\r
                         p.setGuidCName(vid.getVariables(index).getGuid());\r
                     }\r
                     if (!isEmpty(vid.getVariables(index).getGuid())) {\r
                         p.setGuidCName(vid.getVariables(index).getGuid());\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
index 014e8a72202fb748eb27291da867923d045b931d..20a9c329c8333e8898e77d002b2fff45a906bbdc 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/VariablesDlg.java
@@ -430,13 +430,6 @@ public class VariablesDlg extends IDialog {
             return false;\r
         }\r
 \r
             return false;\r
         }\r
 \r

-        if (!isEmpty(this.jTextFieldVariableName.getText())) {\r
-            if (!DataValidation.isHexWordArrayType(this.jTextFieldVariableName.getText())) {\r
-                Log.wrn("Update Variables", "Incorrect data type for Variable Name");\r
-                return false;\r
-            }\r
-        }\r
-\r

         //\r
         // Check FeatureFlag\r
         //\r
         //\r
         // Check FeatureFlag\r
         //\r