1. Modify start script to

[mirror_edk2.git] / Tools / Source / ModuleEditor / src / org / tianocore / packaging / module / ui / MbdLibHeader.java

diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
index 7f355c1e4d8f870751a305b894fc109884116eed..8adde849a0009dc27325474a39ab5747e199a309 100644 (file)
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
@@ -72,8 +72,6 @@ public class MbdLibHeader extends IInternalFrame {
 \r
     private JLabel jLabelCopyright = null;\r
 \r
-    private JTextArea jTextAreaCopyright = null;\r
-\r
     private JLabel jLabelDescription = null;\r
 \r
     private JTextArea jTextAreaDescription = null;\r
@@ -84,8 +82,6 @@ public class MbdLibHeader extends IInternalFrame {
 \r
     private JScrollPane jScrollPaneLicense = null;\r
 \r
-    private JScrollPane jScrollPaneCopyright = null;\r
-\r
     private JScrollPane jScrollPaneDescription = null;\r
 \r
     private StarLabel jStarLabel1 = null;\r
@@ -102,6 +98,8 @@ public class MbdLibHeader extends IInternalFrame {
 \r
     private MbdLibHeaderDocument.MbdLibHeader mbdLibHeader = null;\r
 \r
+    private JTextField jTextFieldCopyright = null;\r
+\r
     /**\r
      This method initializes jTextFieldBaseName \r
      \r
@@ -125,7 +123,7 @@ public class MbdLibHeader extends IInternalFrame {
     private JTextField getJTextFieldGuid() {\r
         if (jTextFieldGuid == null) {\r
             jTextFieldGuid = new JTextField();\r
-            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));\r
+            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));\r
         }\r
         return jTextFieldGuid;\r
     }\r
@@ -153,7 +151,7 @@ public class MbdLibHeader extends IInternalFrame {
     private JButton getJButtonGenerateGuid() {\r
         if (jButtonGenerateGuid == null) {\r
             jButtonGenerateGuid = new JButton();\r
-            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));\r
+            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));\r
             jButtonGenerateGuid.setText("GEN");\r
             jButtonGenerateGuid.addActionListener(this);\r
         }\r
@@ -175,20 +173,6 @@ public class MbdLibHeader extends IInternalFrame {
         return jTextAreaLicense;\r
     }\r
 \r
-    /**\r
-     This method initializes jTextAreaCopyright \r
-     \r
-     @return javax.swing.JTextArea jTextAreaCopyright\r
-     \r
-     **/\r
-    private JTextArea getJTextAreaCopyright() {\r
-        if (jTextAreaCopyright == null) {\r
-            jTextAreaCopyright = new JTextArea();\r
-            jTextAreaCopyright.setLineWrap(true);\r
-        }\r
-        return jTextAreaCopyright;\r
-    }\r
-\r
     /**\r
      This method initializes jTextAreaDescription \r
      \r
@@ -251,22 +235,6 @@ public class MbdLibHeader extends IInternalFrame {
         return jScrollPaneLicense;\r
     }\r
 \r
-    /**\r
-     This method initializes jScrollPaneCopyright \r
-     \r
-     @return javax.swing.JScrollPane jScrollPaneCopyright\r
-     \r
-     **/\r
-    private JScrollPane getJScrollPaneCopyright() {\r
-        if (jScrollPaneCopyright == null) {\r
-            jScrollPaneCopyright = new JScrollPane();\r
-            jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));\r
-            jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
-            jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());\r
-        }\r
-        return jScrollPaneCopyright;\r
-    }\r
-\r
     /**\r
      This method initializes jScrollPaneDescription \r
      \r
@@ -276,13 +244,27 @@ public class MbdLibHeader extends IInternalFrame {
     private JScrollPane getJScrollPaneDescription() {\r
         if (jScrollPaneDescription == null) {\r
             jScrollPaneDescription = new JScrollPane();\r
-            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));\r
+            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 195, 320, 80));\r
             jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
             jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
         }\r
         return jScrollPaneDescription;\r
     }\r
 \r
+    /**\r
+      This method initializes jTextFieldCopyright      \r
+       \r
+      @return javax.swing.JTextField jTextFieldCopyright\r
+     \r
+     **/\r
+    private JTextField getJTextFieldCopyright() {\r
+        if (jTextFieldCopyright == null) {\r
+            jTextFieldCopyright = new JTextField();\r
+            jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,170,320,20));\r
+        }\r
+        return jTextFieldCopyright;\r
+    }\r
+\r
     public static void main(String[] args) {\r
 \r
     }\r
@@ -345,7 +327,7 @@ public class MbdLibHeader extends IInternalFrame {
                 this.jTextAreaLicense.setText(this.mbdLibHeader.getLicense().getStringValue());\r
             }\r
             if (this.mbdLibHeader.getCopyright() != null) {\r
-                this.jTextAreaCopyright.setText(this.mbdLibHeader.getCopyright());\r
+                this.jTextFieldCopyright.setText(this.mbdLibHeader.getCopyright());\r
             }\r
             if (this.mbdLibHeader.getDescription() != null) {\r
                 this.jTextAreaDescription.setText(this.mbdLibHeader.getDescription());\r
@@ -367,7 +349,7 @@ public class MbdLibHeader extends IInternalFrame {
             this.jTextFieldGuid.setEnabled(!isView);\r
             this.jTextFieldVersion.setEnabled(!isView);\r
             this.jTextAreaLicense.setEnabled(!isView);\r
-            this.jTextAreaCopyright.setEnabled(!isView);\r
+            this.jTextFieldCopyright.setEnabled(!isView);\r
             this.jTextAreaDescription.setEnabled(!isView);\r
             this.jButtonCancel.setEnabled(!isView);\r
             this.jButtonGenerateGuid.setEnabled(!isView);\r
@@ -385,7 +367,7 @@ public class MbdLibHeader extends IInternalFrame {
         if (jContentPane == null) {\r
             jLabelDescription = new JLabel();\r
             jLabelDescription.setText("Description");\r
-            jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));\r
+            jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20));\r
             jLabelCopyright = new JLabel();\r
             jLabelCopyright.setText("Copyright");\r
             jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));\r
@@ -419,7 +401,6 @@ public class MbdLibHeader extends IInternalFrame {
             jContentPane.add(getJButtonOk(), null);\r
             jContentPane.add(getJButtonCancel(), null);\r
             jContentPane.add(getJScrollPaneLicense(), null);\r
-            jContentPane.add(getJScrollPaneCopyright(), null);\r
             jContentPane.add(getJScrollPaneDescription(), null);\r
 \r
             jStarLabel1 = new StarLabel();\r
@@ -433,7 +414,7 @@ public class MbdLibHeader extends IInternalFrame {
             jStarLabel5 = new StarLabel();\r
             jStarLabel5.setLocation(new java.awt.Point(0, 170));\r
             jStarLabel6 = new StarLabel();\r
-            jStarLabel6.setLocation(new java.awt.Point(0, 255));\r
+            jStarLabel6.setLocation(new java.awt.Point(0, 195));\r
 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
@@ -441,6 +422,7 @@ public class MbdLibHeader extends IInternalFrame {
             jContentPane.add(jStarLabel4, null);\r
             jContentPane.add(jStarLabel5, null);\r
             jContentPane.add(jStarLabel6, null);\r
+            jContentPane.add(getJTextFieldCopyright(), null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -493,7 +475,7 @@ public class MbdLibHeader extends IInternalFrame {
             Log.err("License couldn't be empty");\r
             return false;\r
         }\r
-        if (isEmpty(this.jTextAreaCopyright.getText())) {\r
+        if (isEmpty(this.jTextFieldCopyright.getText())) {\r
             Log.err("Copyright couldn't be empty");\r
             return false;\r
         }\r
@@ -513,7 +495,7 @@ public class MbdLibHeader extends IInternalFrame {
             Log.err("Incorrect data type for Guid");\r
             return false;\r
         }\r
-        if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {\r
+        if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {\r
             Log.err("Incorrect data type for Copyright");\r
             return false;\r
         }\r
@@ -557,7 +539,7 @@ public class MbdLibHeader extends IInternalFrame {
                 this.mbdLibHeader.setLicense(mLicense);\r
             }\r
 \r
-            this.mbdLibHeader.setCopyright(this.jTextAreaCopyright.getText());\r
+            this.mbdLibHeader.setCopyright(this.jTextFieldCopyright.getText());\r
             this.mbdLibHeader.setDescription(this.jTextAreaDescription.getText());\r
 \r
             if (this.mbdLibHeader.getCreated() == null) {\r