]> git.proxmox.com Git - mirror_edk2.git/blobdiff - Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
Fixed grammar in messages.
[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / FrameworkWizardUI.java
index d97c61a20c808d484440e4f896ae7d8f2f636c44..d72a00591ac6d065d6f14f41f4c3fcc65f1ae96d 100644 (file)
@@ -99,6 +99,7 @@ import org.tianocore.frameworkwizard.platform.ui.FpdPlatformDefs;
 import org.tianocore.frameworkwizard.workspace.Workspace;\r
 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
 import org.tianocore.frameworkwizard.workspace.ui.SwitchWorkspace;\r
+import org.tianocore.frameworkwizard.toolchain.Preferences;\r
 \r
 /**\r
  The class is used to show main GUI of FrameworkWizard\r
@@ -238,11 +239,11 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
 \r
     private JMenuItem jMenuItemProjectChangeWorkspace = null;\r
 \r
-    private JMenu jMenuProjectBuildTargets = null;\r
+    private JMenuItem jMenuItemToolsBuildPreferences = null;\r
 \r
-    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsDebug = null;\r
+//    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsDebug = null;\r
 \r
-    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsRelease = null;\r
+//    private JCheckBoxMenuItem jCheckBoxMenuItemProjectBuildTargetsRelease = null;\r
 \r
     private JMenuItem jMenuItemToolsToolChainConfiguration = null;\r
 \r
@@ -746,11 +747,13 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // Add sub menu items\r
             //\r
-            jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
-            jMenuTools.addSeparator();\r
 \r
             jMenuTools.add(getJMenuItemToolsClone());\r
             jMenuTools.add(getJMenuItemToolsCodeScan());\r
+            jMenuTools.addSeparator();\r
+            \r
+            jMenuTools.add(getJMenuItemToolsToolChainConfiguration());\r
+            jMenuTools.add(getJMenuItemToolsBuildPreferences());\r
         }\r
         return jMenuTools;\r
     }\r
@@ -1268,7 +1271,6 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             jMenuProject.add(getJMenuItemProjectUpdateFar());\r
             jMenuProject.add(getJMenuItemProjectRemoveFar());\r
 \r
-            jMenuProject.add(getJMenuProjectBuildTargets());\r
         }\r
         return jMenuProject;\r
     }\r
@@ -1309,52 +1311,20 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
     }\r
 \r
     /**\r
-     This method initializes jMenuProjectBuildTargets  \r
+     This method initializes jMenuProjectBuildPreferences      \r
      \r
      @return javax.swing.JMenu \r
      \r
      **/\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
+    private JMenuItem getJMenuItemToolsBuildPreferences() {\r
+        if (jMenuItemToolsBuildPreferences == null) {\r
+            jMenuItemToolsBuildPreferences = new JMenuItem();\r
+            jMenuItemToolsBuildPreferences.setText("Build Preferences");\r
+            jMenuItemToolsBuildPreferences.setMnemonic('P');\r
+            jMenuItemToolsBuildPreferences.setEnabled(true);\r
+            jMenuItemToolsBuildPreferences.addActionListener(this);\r
         }\r
-        return jMenuProjectBuildTargets;\r
-    }\r
-\r
-    /**\r
-     This method initializes jCheckBoxMenuItemProjectBuildTargetsDebug \r
-     \r
-     @return javax.swing.JCheckBoxMenuItem     \r
-     \r
-     **/\r
-    private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsDebug() {\r
-        if (jCheckBoxMenuItemProjectBuildTargetsDebug == null) {\r
-            jCheckBoxMenuItemProjectBuildTargetsDebug = new JCheckBoxMenuItem();\r
-            jCheckBoxMenuItemProjectBuildTargetsDebug.setText("Debug");\r
-            jCheckBoxMenuItemProjectBuildTargetsDebug.setEnabled(false);\r
-        }\r
-        return jCheckBoxMenuItemProjectBuildTargetsDebug;\r
-    }\r
-\r
-    /**\r
-     This method initializes jCheckBoxMenuItemProjectBuildTargetsRelease       \r
-     \r
-     @return javax.swing.JCheckBoxMenuItem     \r
-     \r
-     **/\r
-    private JCheckBoxMenuItem getJCheckBoxMenuItemProjectBuildTargetsRelease() {\r
-        if (jCheckBoxMenuItemProjectBuildTargetsRelease == null) {\r
-            jCheckBoxMenuItemProjectBuildTargetsRelease = new JCheckBoxMenuItem();\r
-            jCheckBoxMenuItemProjectBuildTargetsRelease.setText("Release");\r
-            jCheckBoxMenuItemProjectBuildTargetsRelease.setEnabled(false);\r
-        }\r
-        return jCheckBoxMenuItemProjectBuildTargetsRelease;\r
+        return jMenuItemToolsBuildPreferences;\r
     }\r
 \r
     /**\r
@@ -1880,6 +1850,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         if (arg0.getSource() == this.jMenuItemEditFindPpi) {\r
 //            this.findPpi();\r
         }\r
+        \r
+        if (arg0.getSource() == jMenuItemToolsBuildPreferences) {\r
+            configBuildPreferences();\r
+        }\r
 \r
         if (arg0.getSource() == this.jMenuItemProjectChangeWorkspace) {\r
             this.changeWorkspace();\r
@@ -1931,7 +1905,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //\r
         // Make Module Description\r
         //\r
-        dmtnModuleDescription = new IDefaultMutableTreeNode("ModuleDescription", IDefaultMutableTreeNode.MODULE, -1);\r
+        dmtnModuleDescription = new IDefaultMutableTreeNode("Modules", IDefaultMutableTreeNode.MODULE, -1);\r
 \r
         //\r
         // First add package\r
@@ -1980,7 +1954,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //\r
         // Make Package Description\r
         //\r
-        dmtnPackageDescription = new IDefaultMutableTreeNode("PackageDescription", IDefaultMutableTreeNode.PACKAGE, -1);\r
+        dmtnPackageDescription = new IDefaultMutableTreeNode("Packages", IDefaultMutableTreeNode.PACKAGE, -1);\r
         if (GlobalData.vPackageList.size() > 0) {\r
             for (int index = 0; index < GlobalData.vPackageList.size(); index++) {\r
                 dmtnPackageDescription.add(new IDefaultMutableTreeNode(GlobalData.vPackageList.elementAt(index)\r
@@ -1993,7 +1967,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         //\r
         // Make Platform Description\r
         //\r
-        dmtnPlatformDescription = new IDefaultMutableTreeNode("PlatformDescription", IDefaultMutableTreeNode.PLATFORM,\r
+        dmtnPlatformDescription = new IDefaultMutableTreeNode("Platforms", IDefaultMutableTreeNode.PLATFORM,\r
                                                               -1);\r
         if (GlobalData.vPlatformList.size() > 0) {\r
             for (int index = 0; index < GlobalData.vPlatformList.size(); index++) {\r
@@ -2205,7 +2179,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // The module is not in existing packages\r
             //\r
-            Log.wrn("Open Module", "The module hasn't been added to any package of current workspace!");\r
+            Log.wrn("Open Module", "The module does not belong to any package in the current workspace!");\r
             return;\r
         }\r
 \r
@@ -2251,7 +2225,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // The package is not in current workspace\r
             //\r
-            Log.wrn("Open Package", "The package hasn't been added to current workspace!");\r
+            Log.wrn("Open Package", "The package has not been installed in the current workspace!");\r
             return;\r
         }\r
 \r
@@ -2297,7 +2271,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             //\r
             // The platform is not in current workspace\r
             //\r
-            Log.wrn("Open Platform", "The platform hasn't been added to current workspace!");\r
+            Log.wrn("Open Platform", "The platform has not been installed in the current workspace!");\r
             return;\r
         }\r
 \r
@@ -2442,8 +2416,8 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         iTree.addNode(new IDefaultMutableTreeNode("Data Hubs", IDefaultMutableTreeNode.MSA_DATAHUBS, true, id));\r
         iTree.addNode(new IDefaultMutableTreeNode("Hii Packages", IDefaultMutableTreeNode.MSA_HIIPACKAGES, true, id));\r
         iTree.addNode(new IDefaultMutableTreeNode("Guids", IDefaultMutableTreeNode.MSA_GUIDS, true, id));\r
-        iTree.addNode(new IDefaultMutableTreeNode("Externs", IDefaultMutableTreeNode.MSA_EXTERNS, true, id));\r
-        iTree.addNode(new IDefaultMutableTreeNode("PcdCoded", IDefaultMutableTreeNode.MSA_PCDS, true, id));\r
+        iTree.addNode(new IDefaultMutableTreeNode("External Defintions", IDefaultMutableTreeNode.MSA_EXTERNS, true, id));\r
+        iTree.addNode(new IDefaultMutableTreeNode("Pcd Coded", IDefaultMutableTreeNode.MSA_PCDS, true, id));\r
     }\r
 \r
     private void insertPackageTreeNode(Identification id) {\r
@@ -2468,10 +2442,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                                                   id));\r
         iTree.addNode(new IDefaultMutableTreeNode("Platform Definitions",\r
                                                   IDefaultMutableTreeNode.FPD_PLATFORMDEFINITIONS, true, id));\r
-        iTree.addNode(new IDefaultMutableTreeNode("Flash", IDefaultMutableTreeNode.FPD_FLASH, true, id));\r
+        iTree.addNode(new IDefaultMutableTreeNode("Flash Information", IDefaultMutableTreeNode.FPD_FLASH, true, id));\r
         iTree.addNode(new IDefaultMutableTreeNode("Framework Modules", IDefaultMutableTreeNode.FPD_FRAMEWORKMODULES,\r
                                                   true, id));\r
-        iTree.addNode(new IDefaultMutableTreeNode("Pcd Dynamic Build Declarations",\r
+        iTree.addNode(new IDefaultMutableTreeNode("Dynamic PCD Build Declarations",\r
                                                   IDefaultMutableTreeNode.FPD_PCDDYNAMICBUILDDECLARATIONS, true, id));\r
         iTree.addNode(new IDefaultMutableTreeNode("Build Options", IDefaultMutableTreeNode.FPD_BUILDOPTIONS, true, id));\r
     }\r
@@ -2761,16 +2735,16 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
                     try {\r
                         wt.addModuleToPackage(mid, psa);\r
                     } catch (IOException e) {\r
-                        Log.wrn("Upddate MsaFiles of Package", e.getMessage());\r
-                        Log.err("Upddate MsaFiles of Package", e.getMessage());\r
+                        Log.wrn("Update MsaFiles in Package", e.getMessage());\r
+                        Log.err("Update MsaFiles in Package", e.getMessage());\r
                         return;\r
                     } catch (XmlException e) {\r
-                        Log.wrn("Upddate MsaFiles of Package", e.getMessage());\r
-                        Log.err("Upddate MsaFiles of Package", e.getMessage());\r
+                        Log.wrn("Update MsaFiles in Package", e.getMessage());\r
+                        Log.err("Update MsaFiles in Package", e.getMessage());\r
                         return;\r
                     } catch (Exception e) {\r
-                        Log.wrn("Upddate MsaFiles of Package", e.getMessage());\r
-                        Log.err("Upddate MsaFiles of Package", e.getMessage());\r
+                        Log.wrn("Update MsaFiles in Package", e.getMessage());\r
+                        Log.err("Update MsaFiles in Package", e.getMessage());\r
                         return;\r
                     }\r
 \r
@@ -3136,7 +3110,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
+            String strReturn = "Far Creation Completed!";\r
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
         }\r
@@ -3151,7 +3125,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
+            String strReturn = "<html>Far Installalation completed!<br>Refreshing the WORKSPACE!</html>";\r
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
             this.closeAll();\r
@@ -3167,7 +3141,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
+            String strReturn = "<html>Far Deletion completed!<br>Refreshing the WORKSPACE!</html>";\r
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
             this.closeAll();\r
@@ -3183,7 +3157,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         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
+            String strReturn = "<html>Far Update completed!<br>Refreshing the WORKSPACE!</html>";\r
             JOptionPane.showConfirmDialog(null, strReturn, "Done", JOptionPane.DEFAULT_OPTION,\r
                                           JOptionPane.INFORMATION_MESSAGE);\r
             this.closeAll();\r
@@ -3200,6 +3174,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         tcc.showDialog();\r
     }\r
 \r
+    private void configBuildPreferences() {\r
+       Preferences bt = Preferences.getInstance();\r
+       bt.showDialog();\r
+    }\r
     /**\r
      Clone selected item\r
      \r
@@ -3243,15 +3221,15 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
             c.dispose();\r
         }\r
         if (result == DataType.RETURN_TYPE_WORKSPACE) {\r
-            Tools.showInformationMessage("Workspace Clone Finished");\r
+            Tools.showInformationMessage("Workspace Clone Completed!");\r
         }\r
         if (result == DataType.RETURN_TYPE_MODULE_SURFACE_AREA) {\r
-            Tools.showInformationMessage("Module Surface Area Clone Finished");\r
+            Tools.showInformationMessage("Module Clone Completed!");\r
             GlobalData.vModuleList.addElement(c.getMid());\r
             addModuleToTree(c.getMid());\r
         }\r
         if (result == DataType.RETURN_TYPE_PACKAGE_SURFACE_AREA) {\r
-            Tools.showInformationMessage("Package Surface Area Clone Finished");\r
+            Tools.showInformationMessage("Package Clone Completed!");\r
             GlobalData.vPackageList.addElement(c.getPid());\r
             //\r
             // Add new SpdHeader node to the tree\r