Adjusted the Help Text field to be a Text Area inside of a Scroll Pane, with line...

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
index 5cb598d9dabd7bba80f7d1c99f912c67b4dd1af8..ecd4ee30a01086714f6346cd9e77062f6beb349a 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/dialog/PCDsDlg.java
@@ -25,6 +25,7 @@ import javax.swing.JLabel;
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextField;\r
 import javax.swing.JPanel;\r
 import javax.swing.JScrollPane;\r
 import javax.swing.JTextField;\r

+import javax.swing.JTextArea;\r

 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 \r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r


@@ -75,7 +76,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
 \r
     private JLabel jLabelHelpText = null;\r
 \r
 \r
     private JLabel jLabelHelpText = null;\r
 \r

-    private JTextField jTextFieldHelpText = null;\r
+    private JTextArea jTextAreaHelpText = null;\r

 \r
     private JScrollPane jScrollPane = null;\r
 \r
 \r
     private JScrollPane jScrollPane = null;\r
 \r


@@ -95,6 +96,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
 \r
     private JButton jButtonCancel = null;\r
 \r
 \r
     private JButton jButtonCancel = null;\r
 \r

+    private JScrollPane jScrollPaneHelpText = null;\r

     //\r
     // Not used by UI\r
     //\r
     //\r
     // Not used by UI\r
     //\r


@@ -152,19 +154,34 @@ public class PCDsDlg extends IDialog implements ItemListener {
     }\r
 \r
     /**\r
     }\r
 \r
     /**\r

-     * This method initializes jTextFieldHelpText      \r
+     * This method initializes jTextAreaHelpText       \r

      *         \r
      *         \r

-     * @return javax.swing.JTextField  \r
+     * @return javax.swing.JTextArea   \r

      */\r
      */\r

-    private JTextField getJTextFieldHelpText() {\r
-        if (jTextFieldHelpText == null) {\r
-            jTextFieldHelpText = new JTextField();\r
-            jTextFieldHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
-            jTextFieldHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r
+    private JTextArea getJTextAreaHelpText() {\r
+        if (jTextAreaHelpText == null) {\r
+            jTextAreaHelpText = new JTextArea();\r
+            jTextAreaHelpText.setLineWrap(true);\r
+            jTextAreaHelpText.setWrapStyleWord(true);\r
+//            jTextAreaHelpText.setBounds(new java.awt.Rectangle(160, 85, 320, 20));\r
+//            jTextAreaHelpText.setPreferredSize(new java.awt.Dimension(320, 20));\r

         }\r
         }\r

-        return jTextFieldHelpText;\r
+        return jTextAreaHelpText;\r
+    }\r
+    private JScrollPane getJScrollPaneHelpText() {\r
+      if (jScrollPaneHelpText == null ) {\r
+        jScrollPaneHelpText = new JScrollPane();\r
+        jScrollPaneHelpText.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
+        jScrollPaneHelpText.setSize(new java.awt.Dimension(320, 40));\r
+        jScrollPaneHelpText.setPreferredSize(new java.awt.Dimension(320, 40));\r
+        jScrollPaneHelpText.setLocation(new java.awt.Point(160, 85));\r
+        jScrollPaneHelpText.setViewportView(getJTextAreaHelpText());\r
+\r
+      }\r
+      return jScrollPaneHelpText;\r

     }\r
 \r
     }\r
 \r

+\r

     /**\r
      This method initializes jScrollPane  \r
      \r
     /**\r
      This method initializes jScrollPane  \r
      \r


@@ -201,8 +218,9 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JTextField getJTextFieldFeatureFlag() {\r
         if (jTextFieldFeatureFlag == null) {\r
             jTextFieldFeatureFlag = new JTextField();\r
     private JTextField getJTextFieldFeatureFlag() {\r
         if (jTextFieldFeatureFlag == null) {\r
             jTextFieldFeatureFlag = new JTextField();\r

-            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 110, 320, 20));\r
+            jTextFieldFeatureFlag.setBounds(new java.awt.Rectangle(160, 130, 320, 20));\r

             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jTextFieldFeatureFlag.setPreferredSize(new java.awt.Dimension(320, 20));\r

+            //jLabelFeatureFlag.setBounds(new  java.awt.Rectangle(15, 130, 140, 20));\r

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


@@ -216,7 +234,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JButton getJButtonOk() {\r
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r
     private JButton getJButtonOk() {\r
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r

-            jButtonOk.setBounds(new java.awt.Rectangle(290, 165, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 185, 90, 20));\r

             jButtonOk.setText("Ok");\r
             jButtonOk.addActionListener(this);\r
         }\r
             jButtonOk.setText("Ok");\r
             jButtonOk.addActionListener(this);\r
         }\r


@@ -232,7 +250,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r
     private JButton getJButtonCancel() {\r
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r

-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 165, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 185, 90, 20));\r

             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addActionListener(this);\r
         }\r
             jButtonCancel.setText("Cancel");\r
             jButtonCancel.addActionListener(this);\r
         }\r


@@ -248,7 +266,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
      \r
      **/\r
     private void init() {\r
      \r
      **/\r
     private void init() {\r

-        this.setSize(508, 240);\r
+        this.setSize(508, 260);\r

         this.setContentPane(getJScrollPane());\r
         this.setTitle("Pcd Coded");\r
         initFrame();\r
         this.setContentPane(getJScrollPane());\r
         this.setTitle("Pcd Coded");\r
         initFrame();\r


@@ -271,7 +289,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
             this.jComboBoxCName.setSelectedItem(id.getName());\r
             this.jTextFieldTokenSpaceGuid.setText(id.getGuid());\r
             this.jTextFieldDefaultValue.setText(id.getValue());\r
             this.jComboBoxCName.setSelectedItem(id.getName());\r
             this.jTextFieldTokenSpaceGuid.setText(id.getGuid());\r
             this.jTextFieldDefaultValue.setText(id.getValue());\r

-            this.jTextFieldHelpText.setText(id.getHelp());\r
+            this.jTextAreaHelpText.setText(id.getHelp());\r

             this.jComboBoxItemType.setSelectedItem(id.getType());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
             this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r
             this.jComboBoxItemType.setSelectedItem(id.getType());\r
             this.jTextFieldFeatureFlag.setText(id.getFeatureFlag());\r
             this.jArchCheckBox.setSelectedItems(id.getSupArchList());\r


@@ -312,30 +330,32 @@ public class PCDsDlg extends IDialog implements ItemListener {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jArchCheckBox = new ArchCheckBox();\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jArchCheckBox = new ArchCheckBox();\r

-            jArchCheckBox.setBounds(new java.awt.Rectangle(160, 135, 320, 20));\r

             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jLabelArch = new JLabel();\r
             jArchCheckBox.setPreferredSize(new java.awt.Dimension(320, 20));\r
             jLabelArch = new JLabel();\r

-            jLabelArch.setBounds(new java.awt.Rectangle(15, 135, 140, 20));\r

             jLabelArch.setText("Sup Arch List");\r
             jLabelFeatureFlag = new JLabel();\r
             jLabelArch.setText("Sup Arch List");\r
             jLabelFeatureFlag = new JLabel();\r

-            jLabelFeatureFlag.setBounds(new java.awt.Rectangle(15, 110, 140, 20));\r

             jLabelFeatureFlag.setText("Feature Flag");\r
             jLabelTokenSpaceGuid = new JLabel();\r
             jLabelFeatureFlag.setText("Feature Flag");\r
             jLabelTokenSpaceGuid = new JLabel();\r

-            jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r

             jLabelTokenSpaceGuid.setText("Token Space C Name");\r
             jLabelTokenSpaceGuid.setVisible(false);\r
             jLabelHelpText = new JLabel();\r
             jLabelTokenSpaceGuid.setText("Token Space C Name");\r
             jLabelTokenSpaceGuid.setVisible(false);\r
             jLabelHelpText = new JLabel();\r

-            jLabelHelpText.setBounds(new java.awt.Rectangle(15, 85, 140, 20));\r

             jLabelHelpText.setText("Help Text");\r
             jLabelC_Name = new JLabel();\r
             jLabelC_Name.setText("C Name");\r
             jLabelHelpText.setText("Help Text");\r
             jLabelC_Name = new JLabel();\r
             jLabelC_Name.setText("C Name");\r

-            jLabelC_Name.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r

             jLabelDefaultValue = new JLabel();\r
             jLabelDefaultValue.setText("Default Value");\r
             jLabelDefaultValue = new JLabel();\r
             jLabelDefaultValue.setText("Default Value");\r

-            jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r

             jLabelItemType = new JLabel();\r
             jLabelItemType.setText("Item Type");\r
             jLabelItemType = new JLabel();\r
             jLabelItemType.setText("Item Type");\r

-            jLabelItemType.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
+\r
+            jLabelC_Name.setBounds(new       java.awt.Rectangle(15, 10, 140, 20));\r
+            jLabelItemType.setBounds(new     java.awt.Rectangle(15, 35, 140, 20));\r
+            jLabelDefaultValue.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
+            jLabelHelpText.setBounds(new     java.awt.Rectangle(15, 85, 140, 20));\r
+            jLabelFeatureFlag.setBounds(new  java.awt.Rectangle(15, 130, 140, 20));\r
+            jLabelArch.setBounds(new java.awt.Rectangle(15, 155, 140, 20));\r
+\r
+            jArchCheckBox.setBounds(new      java.awt.Rectangle(160, 155, 320, 20));\r
+            jLabelTokenSpaceGuid.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r

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


@@ -346,6 +366,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
             jContentPane.add(getJComboBoxCName(), null);\r
             jContentPane.add(jLabelDefaultValue, null);\r
             jContentPane.add(getJTextFieldDefaultValue(), null);\r
             jContentPane.add(getJComboBoxCName(), null);\r
             jContentPane.add(jLabelDefaultValue, null);\r
             jContentPane.add(getJTextFieldDefaultValue(), null);\r

+            jContentPane.add(getJScrollPaneHelpText(), null);\r

             jContentPane.add(getJComboBoxItemType(), null);\r
             jStarLabel1 = new StarLabel();\r
             jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
             jContentPane.add(getJComboBoxItemType(), null);\r
             jStarLabel1 = new StarLabel();\r
             jStarLabel1.setLocation(new java.awt.Point(0, 10));\r


@@ -357,7 +378,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelHelpText, null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jStarLabel3, null);\r
             jContentPane.add(jLabelHelpText, null);\r

-            jContentPane.add(getJTextFieldHelpText(), null);\r
+//            jContentPane.add(getJTextFieldHelpText(), null);\r

 \r
             jContentPane.add(jLabelTokenSpaceGuid, null);\r
             jContentPane.add(getJTextFieldTokenSpaceGuid(), null);\r
 \r
             jContentPane.add(jLabelTokenSpaceGuid, null);\r
             jContentPane.add(getJTextFieldTokenSpaceGuid(), null);\r


@@ -449,8 +470,8 @@ public class PCDsDlg extends IDialog implements ItemListener {
         //\r
         // Check HelpText\r
         //\r
         //\r
         // Check HelpText\r
         //\r

-        if (isEmpty(this.jTextFieldHelpText.getText())) {\r
-            Log.wrn("Update PcdCoded", "Help Text couldn't be empty");\r
+        if (isEmpty(this.jTextAreaHelpText.getText())) {\r
+            Log.wrn("Update PcdCoded", "Help Text should not be empty");\r

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


@@ -475,7 +496,7 @@ public class PCDsDlg extends IDialog implements ItemListener {
         Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
 \r
         String arg4 = this.jTextFieldDefaultValue.getText();\r
         Vector<String> arg3 = this.jArchCheckBox.getSelectedItemsVector();\r
 \r
         String arg4 = this.jTextFieldDefaultValue.getText();\r

-        String arg5 = this.jTextFieldHelpText.getText();\r
+        String arg5 = this.jTextAreaHelpText.getText();\r

         String arg6 = this.jComboBoxItemType.getSelectedItem().toString();\r
         id = new PcdCodedIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6);\r
         return id;\r
         String arg6 = this.jComboBoxItemType.getSelectedItem().toString();\r
         id = new PcdCodedIdentification(arg0, arg1, arg2, arg3, arg4, arg5, arg6);\r
         return id;\r


@@ -504,9 +525,9 @@ public class PCDsDlg extends IDialog implements ItemListener {
             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r
             } else {\r
                 this.jTextFieldTokenSpaceGuid.setText(pcd.getPcd(index).getGuidCName());\r
                 Tools.generateComboBoxByVector(this.jComboBoxItemType, pcd.getPcd(index).getType());\r

-                this.jTextFieldHelpText.setText(pcd.getPcd(index).getHelp());\r
-                this.jTextFieldHelpText.setSelectionStart(0);\r
-                this.jTextFieldHelpText.setSelectionEnd(0);\r
+                this.jTextAreaHelpText.setText(pcd.getPcd(index).getHelp());\r
+                this.jTextAreaHelpText.setSelectionStart(0);\r
+                this.jTextAreaHelpText.setSelectionEnd(0);\r

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