Fixed grammar in text messages.

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java
index 71adab4d82735d22081a16d4153c07ecab31992c..bd1b7942f33f79f5b187ddf45f55b45c922027ee 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/FarStringDefinition.java
@@ -8,14 +8,14 @@ public class FarStringDefinition {
     public static final String CREATE_STEP_ONE_TITLE = \r
         "Create Framework Archive(FAR) - Step 1: Set FAR's basic information";\r
     public static final String CREATE_STEP_TWO_TITLE = \r
     public static final String CREATE_STEP_ONE_TITLE = \r
         "Create Framework Archive(FAR) - Step 1: Set FAR's basic information";\r
     public static final String CREATE_STEP_TWO_TITLE = \r

-        "Create Framework Archive(FAR) - Step 2: Choose Packages and Platforms";\r
+        "Create Framework Archive(FAR) - Step 2: Choose Packages and/or Platforms";\r

     public static final String CREATE_STEP_THREE_TITLE = \r
         "Create Framework Archive(FAR) - Step 3: Set file filter";\r
     public static final String CREATE_STEP_FOUR_TITLE = \r
         "Create Framework Archive(FAR) - Step 4: Choose target file and finish";\r
 \r
     public static final String DELETE_STEP_ONE_TITLE = \r
     public static final String CREATE_STEP_THREE_TITLE = \r
         "Create Framework Archive(FAR) - Step 3: Set file filter";\r
     public static final String CREATE_STEP_FOUR_TITLE = \r
         "Create Framework Archive(FAR) - Step 4: Choose target file and finish";\r
 \r
     public static final String DELETE_STEP_ONE_TITLE = \r

-        "Delete Framework Archive(FAR) - Step 1: Choose FAR from framework database";\r
+        "Delete Framework Archive(FAR) - Step 1: Choose FAR from current WORKSPACE";\r

     public static final String DELETE_STEP_TWO_TITLE = \r
         "Delete Framework Archive(FAR) - Step 2: Choose delete mode and finish";\r
     \r
     public static final String DELETE_STEP_TWO_TITLE = \r
         "Delete Framework Archive(FAR) - Step 2: Choose delete mode and finish";\r
     \r


@@ -25,9 +25,9 @@ public class FarStringDefinition {
         "Update Framework Archive(FAR) - Step 2: Summary";\r
     \r
     public static final String INSTALL_STEP_ONE_TITLE = \r
         "Update Framework Archive(FAR) - Step 2: Summary";\r
     \r
     public static final String INSTALL_STEP_ONE_TITLE = \r

-        "Install Framework Archive(FAR) - Step 1: Browse FAR file";\r
+        "Install Framework Archive(FAR) - Step 1: Select FAR file";\r

     public static final String INSTALL_STEP_TWO_TITLE = \r
     public static final String INSTALL_STEP_TWO_TITLE = \r

-        "Install Framework Archive(FAR) - Step 2: Set path for packages or/and platforms";\r
+        "Install Framework Archive(FAR) - Step 2: Set path for packages and/or platforms";\r

     \r
     ///\r
     /// \r
     \r
     ///\r
     /// \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
index 24227242805b8fc6a94c627fcd4289ee6323256b..3d3fdde2e910e5e837ee7e38cdb4c910a63b5bdc 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepFour.java
@@ -211,7 +211,7 @@ public class CreateStepFour extends IDialog implements MouseListener {
             jLabel2.setText("File to Save:  ");\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(29,108,320,20));\r
             jLabel2.setText("File to Save:  ");\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(29,108,320,20));\r

-            jLabel.setText("This FAR will depend on following packages: ");\r
+            jLabel.setText("This FAR will depend on the following packages: ");\r

             jLabel.setVisible(false);\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jLabel.setVisible(false);\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
index 32d2da4278a70b23c44ac543a009e45f9a008d16..0126b96f38dc2fa571aa39b0fb9dd69d3e617134 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepOne.java
@@ -126,7 +126,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r
             jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 520, 20));\r
         if (jTextFieldBaseName == null) {\r
             jTextFieldBaseName = new JTextField();\r
             jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 520, 20));\r

-            jTextFieldBaseName.setToolTipText("An brief Identifier, such as USB I/O Library, of the module");\r
+            jTextFieldBaseName.setToolTipText("A brief Identifier, such as USB I/O Drivers, of the Framework Archive.");\r

         }\r
         return jTextFieldBaseName;\r
     }\r
         }\r
         return jTextFieldBaseName;\r
     }\r


@@ -188,7 +188,8 @@ public class CreateStepOne extends IDialog implements MouseListener {
             jTextAreaLicense = new JTextArea();\r
             jTextAreaLicense.setText("");\r
             jTextAreaLicense.setLineWrap(true);\r
             jTextAreaLicense = new JTextArea();\r
             jTextAreaLicense.setText("");\r
             jTextAreaLicense.setLineWrap(true);\r

-            jTextAreaLicense.setToolTipText("The License for this file");\r
+            jTextAreaLicense.setWrapStyleWord(true);\r
+            jTextAreaLicense.setToolTipText("The License for this FAR file.");\r

         }\r
         return jTextAreaLicense;\r
     }\r
         }\r
         return jTextAreaLicense;\r
     }\r


@@ -203,7 +204,8 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextAreaDescription == null) {\r
             jTextAreaDescription = new JTextArea();\r
             jTextAreaDescription.setLineWrap(true);\r
         if (jTextAreaDescription == null) {\r
             jTextAreaDescription = new JTextArea();\r
             jTextAreaDescription.setLineWrap(true);\r

-            jTextAreaDescription.setToolTipText("A verbose description of the module");\r
+            jTextAreaDescription.setWrapStyleWord(true);\r
+            jTextAreaDescription.setToolTipText("A verbose description of the FAR contents.");\r

         }\r
         return jTextAreaDescription;\r
     }\r
         }\r
         return jTextAreaDescription;\r
     }\r


@@ -266,7 +268,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
             jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 85, 520, 20));\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
             jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 85, 520, 20));\r

-            jTextFieldAbstract.setToolTipText("A one sentence description of this module");\r
+            jTextFieldAbstract.setToolTipText("A one sentence description of this FAR package.");\r

         }\r
         return jTextFieldAbstract;\r
     }\r
         }\r
         return jTextFieldAbstract;\r
     }\r


@@ -497,11 +499,11 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check BaseName\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r
         // Check BaseName\r
         //\r
         if (isEmpty(this.jTextFieldBaseName.getText())) {\r

-            Log.wrn("Create far", "Base Name couldn't be empty");\r
+            Log.wrn("Create far", "FAR Name must be entered.");\r

             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r

-            Log.wrn("Create far", "Incorrect data type for Base Name");\r
+            Log.wrn("Create far", "Incorrect data type for FAR Name");\r

             return false;\r
         }\r
         farHeader.setFarName(this.jTextFieldBaseName.getText());\r
             return false;\r
         }\r
         farHeader.setFarName(this.jTextFieldBaseName.getText());\r


@@ -510,7 +512,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r
         // Check Guid\r
         //\r
         if (isEmpty(this.jTextFieldGuid.getText())) {\r

-            Log.wrn("Create far", "Guid Value couldn't be empty");\r
+            Log.wrn("Create far", "A GUID must be entered.");\r

             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r


@@ -523,7 +525,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r
         // Check Version\r
         //\r
         if (isEmpty(this.jTextFieldVersion.getText())) {\r

-            Log.wrn("Create far", "Version couldn't be empty");\r
+            Log.wrn("Create far", "A Version must be entered.");\r

             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r


@@ -536,7 +538,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Abstact\r
         //\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r
         // Check Abstact\r
         //\r
         if (isEmpty(this.jTextFieldAbstract.getText())) {\r

-            Log.wrn("Create far", "Abstract couldn't be empty");\r
+            Log.wrn("Create far", "An Abstract must be entered.");\r

             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
             return false;\r
         }\r
         if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r


@@ -549,7 +551,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Description\r
         //\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r
         // Check Description\r
         //\r
         if (isEmpty(this.jTextAreaDescription.getText())) {\r

-            Log.wrn("Create far", "Description couldn't be empty");\r
+            Log.wrn("Create far", "A Description must be entered.");\r

             return false;\r
         }\r
         farHeader.setDescription(this.jTextAreaDescription.getText());\r
             return false;\r
         }\r
         farHeader.setDescription(this.jTextAreaDescription.getText());\r


@@ -558,7 +560,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check Copyright\r
         //\r
         if (isEmpty(this.jTextAreaCopyright.getText())) {\r
         // Check Copyright\r
         //\r
         if (isEmpty(this.jTextAreaCopyright.getText())) {\r

-            Log.wrn("Create far", "Copyright couldn't be empty");\r
+            Log.wrn("Create far", "The Copyright must be entered.");\r

             return false;\r
         }\r
         farHeader.setCopyright(this.jTextAreaCopyright.getText());\r
             return false;\r
         }\r
         farHeader.setCopyright(this.jTextAreaCopyright.getText());\r


@@ -567,7 +569,7 @@ public class CreateStepOne extends IDialog implements MouseListener {
         // Check License\r
         //\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r
         // Check License\r
         //\r
         if (isEmpty(this.jTextAreaLicense.getText())) {\r

-            Log.wrn("Create far", "License couldn't be empty");\r
+            Log.wrn("Create far", "The License must be entered.");\r

             return false;\r
         }\r
         farHeader.setLicense(this.jTextAreaLicense.getText());\r
             return false;\r
         }\r
         farHeader.setLicense(this.jTextAreaLicense.getText());\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
index 380081066bb4fc4548986be76d753e0f43a73d05..1e95cc35ffd0440848f0693f5e01f751f5b508bf 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepThree.java
@@ -78,8 +78,8 @@ public class CreateStepThree extends IDialog implements MouseListener {
         if (jTextArea == null) {\r
             jTextArea = new JTextArea();\r
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r
         if (jTextArea == null) {\r
             jTextArea = new JTextArea();\r
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r

-            jTextArea.setText("Add more file filter regular expressions in text field separated with space. \n");\r
-            jTextArea.append("Note that regular expressions please reference PERL language. ");\r
+            jTextArea.setText("Add additional file filter regular expressions in the text field, separated by space characters.\n");\r
+            jTextArea.append("Note, for additional information about regular expressions, please reference PERL language regular expressions.");\r

             jTextArea.setEditable(false);\r
         }\r
         return jTextArea;\r
             jTextArea.setEditable(false);\r
         }\r
         return jTextArea;\r


@@ -209,7 +209,7 @@ public class CreateStepThree extends IDialog implements MouseListener {
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
             jLabel1.setBounds(new java.awt.Rectangle(30, 220, 260, 20));\r
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
             jLabel1.setBounds(new java.awt.Rectangle(30, 220, 260, 20));\r

-            jLabel1.setText("Input File Filter Pattern (Ref to ...)");\r
+            jLabel1.setText("Input File Filter Pattern (regular expressions)");\r

             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(30, 64, 160, 20));\r
             jLabel.setText("File Filter Pattern: ");\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(30, 64, 160, 20));\r
             jLabel.setText("File Filter Pattern: ");\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
index 240ebef2a704064243685de229b0a9f45f200cfb..99c2cf19d6c7a45bed11df1f479bd559c84fd2d4 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/createui/CreateStepTwo.java
@@ -252,7 +252,7 @@ public class CreateStepTwo extends IDialog implements MouseListener {
             //\r
             if (jComboBoxPlatform.getAllCheckedItemsIndex().size() == 0\r
                 && jComboBoxPackage.getAllCheckedItemsIndex().size() == 0) {\r
             //\r
             if (jComboBoxPlatform.getAllCheckedItemsIndex().size() == 0\r
                 && jComboBoxPackage.getAllCheckedItemsIndex().size() == 0) {\r

-                Log.wrn("Create far", "At least choose one of packages and platforms. ");\r
+                Log.wrn("Create far", "Choose at least one package and/or platform.");\r

                 return;\r
             }\r
             if (stepThree == null) {\r
                 return;\r
             }\r
             if (stepThree == null) {\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
index c22097c7c7b9b628d7f9e25c6a8586c81a679412..f5b68f4eaebeaf26dece7ae43db6d4d50c06d798 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepOne.java
@@ -128,12 +128,12 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener {
     private JTextArea getJTextArea1() {\r
         if (jTextAreaInstruction == null) {\r
             jTextAreaInstruction = new JTextArea();\r
     private JTextArea getJTextArea1() {\r
         if (jTextAreaInstruction == null) {\r
             jTextAreaInstruction = new JTextArea();\r

-            jTextAreaInstruction.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r
-            jTextAreaInstruction.setText("Step 1: Choose FAR from framework database. \n");\r
+            jTextAreaInstruction.setBounds(new java.awt.Rectangle(30, 7, 662, 50));\r
+            jTextAreaInstruction.setText("Step 1: Select FAR to remove.\n");\r

             jTextAreaInstruction.setCaretColor(Color.RED);\r
             jTextAreaInstruction\r
             jTextAreaInstruction.setCaretColor(Color.RED);\r
             jTextAreaInstruction\r

-                                .append("After choose FAR, the packages and platforms which belong to the FAR will display. \n");\r
-            jTextAreaInstruction.append("Picture \"Okay\" or \"No\" indicates whether FAR can be removed or not. ");\r
+                                .append("After choosing the FAR, the packages and/or platforms that belong to the FAR will displayed.\n");\r
+            jTextAreaInstruction.append("Icon \"OK\" or \"NO\" indicates whether the FAR can be safely removed.");\r

             jTextAreaInstruction.setEditable(false);\r
         }\r
         return jTextAreaInstruction;\r
             jTextAreaInstruction.setEditable(false);\r
         }\r
         return jTextAreaInstruction;\r


@@ -269,7 +269,7 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener {
             jLabelImage = new JLabel();\r
             jLabelImage.setBounds(new java.awt.Rectangle(30, 319, 36, 36));\r
             jLabel4 = new JLabel();\r
             jLabelImage = new JLabel();\r
             jLabelImage.setBounds(new java.awt.Rectangle(30, 319, 36, 36));\r
             jLabel4 = new JLabel();\r

-            jLabel4.setBounds(new java.awt.Rectangle(71, 325, 289, 20));\r
+            jLabel4.setBounds(new java.awt.Rectangle(71, 325, 320, 20));\r

             jLabel3 = new JLabel();\r
             jLabel3.setBounds(new java.awt.Rectangle(360, 170, 113, 20));\r
             jLabel3.setText("FAR's Platforms");\r
             jLabel3 = new JLabel();\r
             jLabel3.setBounds(new java.awt.Rectangle(360, 170, 113, 20));\r
             jLabel3.setText("FAR's Platforms");\r


@@ -338,12 +338,12 @@ public class DeleteStepOne extends IDialog implements ListSelectionListener {
 \r
             if (flag) {\r
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/Yes.JPG")));\r
 \r
             if (flag) {\r
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/Yes.JPG")));\r

-                jLabel4.setText("Without any remain packages depend on this FAR. ");\r
+                jLabel4.setText("None of the remaining packages depend on this FAR. ");\r

                 jButtonDetail.setVisible(false);\r
                 jButtonNext.setEnabled(true);\r
             } else {\r
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/No.JPG")));\r
                 jButtonDetail.setVisible(false);\r
                 jButtonNext.setEnabled(true);\r
             } else {\r
                 jLabelImage.setIcon(new ImageIcon(getClass().getResource("/resources/images/No.JPG")));\r

-                jLabel4.setText("Some remain packages still depend on this FAR. ");\r
+                jLabel4.setText("Some of the remaining packages still depend on this FAR. ");\r

                 //        jButtonDetail.setVisible(true);\r
                 jButtonNext.setEnabled(false);\r
             }\r
                 //        jButtonDetail.setVisible(true);\r
                 jButtonNext.setEnabled(false);\r
             }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
index 718fe18b1889d1396a0df2cea01f233959af0a0f..8d7e4e6fed56456ecb13776b7f59b3f8c76eca3d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/deleteui/DeleteStepTwo.java
@@ -123,8 +123,8 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
             jTextArea = new JTextArea();\r
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r
             jTextArea.setText("Step 2: Choose Delete Mode. \n");\r
             jTextArea = new JTextArea();\r
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r
             jTextArea.setText("Step 2: Choose Delete Mode. \n");\r

-            jTextArea.append("Mode 1 only remove register information from framework database. \n");\r
-            jTextArea.append("Mode 2 also delete all files from file system. ");\r
+            jTextArea.append("Mode 1 Only remove registation information from the WORKSPACE. \n");\r
+            jTextArea.append("Mode 2 Also delete all files and directories from file system. ");\r

             jTextArea.setEditable(false);\r
         }\r
         return jTextArea;\r
             jTextArea.setEditable(false);\r
         }\r
         return jTextArea;\r


@@ -138,9 +138,9 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton() {\r
         if (jRadioButton == null) {\r
             jRadioButton = new JRadioButton();\r
     private JRadioButton getJRadioButton() {\r
         if (jRadioButton == null) {\r
             jRadioButton = new JRadioButton();\r

-            jRadioButton.setBounds(new java.awt.Rectangle(40,100,340,20));\r
+            jRadioButton.setBounds(new java.awt.Rectangle(40,100,440,20));\r

             jRadioButton.setSelected(true);\r
             jRadioButton.setSelected(true);\r

-            jRadioButton.setText("Mode 1: Only remove from framework database");\r
+            jRadioButton.setText("Mode 1: Only remove registration information from the WORKSPACE.");\r

         }\r
         return jRadioButton;\r
     }\r
         }\r
         return jRadioButton;\r
     }\r


@@ -153,8 +153,8 @@ public class DeleteStepTwo extends IDialog implements MouseListener {
     private JRadioButton getJRadioButton1() {\r
         if (jRadioButton1 == null) {\r
             jRadioButton1 = new JRadioButton();\r
     private JRadioButton getJRadioButton1() {\r
         if (jRadioButton1 == null) {\r
             jRadioButton1 = new JRadioButton();\r

-            jRadioButton1.setBounds(new java.awt.Rectangle(40,140,358,20));\r
-            jRadioButton1.setText("Mode 2: Delete all related files from workspace");\r
+            jRadioButton1.setBounds(new java.awt.Rectangle(40,140,440,20));\r
+            jRadioButton1.setText("Mode 2: Delete ALL related files and directories from the WORKSPACE.");\r

         }\r
         return jRadioButton1;\r
     }\r
         }\r
         return jRadioButton1;\r
     }\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
index bfc84486a7124d8b0b78b8a4dfc8631678bb3a15..24cd1369eab5a9767ce98b098f5cf7a586801d53 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepOne.java
@@ -234,8 +234,8 @@ public class InstallStepOne extends IDialog implements MouseListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelWarning = new JLabel();\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelWarning = new JLabel();\r

-            jLabelWarning.setBounds(new java.awt.Rectangle(30, 125, 410, 20));\r
-            jLabelWarning.setText("Can't install this FAR, lack following packages in current workspace");\r
+            jLabelWarning.setBounds(new java.awt.Rectangle(30, 125, 510, 20));\r
+            jLabelWarning.setText("Cannot install this FAR, the WORKSPACE is missing the following required packages.");\r

             jLabelWarning.setVisible(false);\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));\r
             jLabelWarning.setVisible(false);\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));\r


@@ -263,7 +263,7 @@ public class InstallStepOne extends IDialog implements MouseListener {
             //\r
             File farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r
             //\r
             File farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r

-                Log.wrn("Install far", "Please choose a FAR file already exists. ");\r
+                Log.wrn("Install far", "Please choose an existing FAR file.");\r

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
index 7087634b52c6fc97676dac66e5a7c391484c4bfe..5fd53a531af467d37a37398b7b85572d18d9c29d 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java
@@ -100,9 +100,9 @@ public class InstallStepTwo extends IDialog implements MouseListener {
         if (jTextArea == null) {\r
             jTextArea = new JTextArea();\r
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r
         if (jTextArea == null) {\r
             jTextArea = new JTextArea();\r
             jTextArea.setBounds(new java.awt.Rectangle(30, 7, 642, 50));\r

-            jTextArea.setText("Step 2: Set Path for Packages and Platforms. \n");\r
+            jTextArea.setText("Step 2: Set Install Path for Packages and/or Platforms.\n");\r

             jTextArea.setCaretColor(Color.RED);\r
             jTextArea.setCaretColor(Color.RED);\r

-            jTextArea.append("Note that path is relative to WORKSPACE. ");\r
+            jTextArea.append("Note that the Install Path is Relative to WORKSPACE. ");\r

             jTextArea.setEditable(false);\r
         }\r
         return jTextArea;\r
             jTextArea.setEditable(false);\r
         }\r
         return jTextArea;\r


@@ -302,10 +302,10 @@ public class InstallStepTwo extends IDialog implements MouseListener {
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
             jLabel1.setBounds(new java.awt.Rectangle(30, 195, 348, 18));\r
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
             jLabel1.setBounds(new java.awt.Rectangle(30, 195, 348, 18));\r

-            jLabel1.setText("Edit pathes for platforms: ");\r
+            jLabel1.setText("Edit \"Install To\" paths for platforms: ");\r

             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(29, 60, 366, 20));\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(29, 60, 366, 20));\r

-            jLabel.setText("Edit pathes for packages");\r
+            jLabel.setText("Edit \"Install To\" paths for packages");\r

             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jContentPane.add(getJTextArea(), null);\r
             jContentPane = new JPanel();\r
             jContentPane.setLayout(null);\r
             jContentPane.add(getJTextArea(), null);\r


@@ -346,11 +346,11 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + packageModel.getValueAt(i, 3));\r
                 if (!isPackagePathValid(toFile)) {\r
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + packageModel.getValueAt(i, 3));\r
                 if (!isPackagePathValid(toFile)) {\r

-                    Log.wrn("Install far", packageVector.get(i) + " path already has package now. ");\r
+                    Log.wrn("Install far", packageVector.get(i) + " path already contains a package.");\r

                     return;\r
                 }\r
                 if (allNewPath.contains(toFile)) {\r
                     return;\r
                 }\r
                 if (allNewPath.contains(toFile)) {\r

-                    Log.wrn("Install far", "Path " + packageModel.getValueAt(i, 3) + " is specified by twice. ");\r
+                    Log.wrn("Install far", "Path " + packageModel.getValueAt(i, 3) + " is specified twice.");\r

                     return;\r
                 }\r
                 allNewPath.add(toFile);\r
                     return;\r
                 }\r
                 allNewPath.add(toFile);\r


@@ -365,7 +365,7 @@ public class InstallStepTwo extends IDialog implements MouseListener {
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + platformModel.getValueAt(i, 3));\r
                 if (!isPlatformPathValid(toFile)) {\r
                 File toFile = new File(Workspace.getCurrentWorkspace() + File.separatorChar\r
                                        + platformModel.getValueAt(i, 3));\r
                 if (!isPlatformPathValid(toFile)) {\r

-                    Log.wrn("Install far", platformVector.get(i) + " path already has platform now. ");\r
+                    Log.wrn("Install far", platformVector.get(i) + " path already contains a platform.");\r

                     return;\r
                 }\r
                 File fpdFile = new File((String) platformModel.getValueAt(i, 3) + File.separatorChar\r
                     return;\r
                 }\r
                 File fpdFile = new File((String) platformModel.getValueAt(i, 3) + File.separatorChar\r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
index bea6f7c7a00b6d30f8c99dc3e610ef0b973517e8..5ae496672a17b9eccfff2649f806866306081062 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepOne.java
@@ -215,7 +215,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
             jLabel1.setBounds(new java.awt.Rectangle(30, 110, 355, 18));\r
         if (jContentPane == null) {\r
             jLabel1 = new JLabel();\r
             jLabel1.setBounds(new java.awt.Rectangle(30, 110, 355, 18));\r

-            jLabel1.setText("Choose FAR from current framework database");\r
+            jLabel1.setText("Choose FAR from current WORKSPACE.");\r

             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));\r
             jLabel.setText("Choose FAR file: ");\r
             jLabel = new JLabel();\r
             jLabel.setBounds(new java.awt.Rectangle(30, 80, 97, 20));\r
             jLabel.setText("Choose FAR file: ");\r


@@ -242,7 +242,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             //\r
             farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r
             //\r
             farFile = new File(jTextFieldFarFile.getText());\r
             if (!farFile.exists() || !farFile.isFile()) {\r

-                Log.wrn("Update far", "Please choose a FAR file already exists. ");\r
+                Log.wrn("Update far", "Please choose a FAR file that already exists.");\r

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


@@ -261,7 +261,7 @@ public class UpdateStepOne extends IDialog implements MouseListener {
             // Add more logic process here\r
             //\r
             if (jListFarFromDb.getSelectedValue() == null) {\r
             // Add more logic process here\r
             //\r
             if (jListFarFromDb.getSelectedValue() == null) {\r

-                Log.wrn("Update far", "Please choose a FAR from framework database. ");\r
+                Log.wrn("Update far", "Please choose a FAR from current WORKSPACE.");\r

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
index 0ead2cf6dc3ef442137285cca119c3142279e274..287d559e08a975c0985cfd6ff99876b563fee977 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java
@@ -275,7 +275,7 @@ public class UpdateStepTwo extends IDialog implements MouseListener {
             Iterator resultIter = resultList.iterator();\r
             while (resultIter.hasNext()) {\r
                 Log.wrn("Update far", "Missing dependency package " + ((PackageIdentification) resultIter.next()).toString()\r
             Iterator resultIter = resultList.iterator();\r
             while (resultIter.hasNext()) {\r
                 Log.wrn("Update far", "Missing dependency package " + ((PackageIdentification) resultIter.next()).toString()\r

-                        + "in workspace!");\r
+                        + " in workspace!");\r

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