1. Modify start script to

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

diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
index f3e7011b3dbe826a7fa442ae5295474260630754..e1682887c5337fc364f488d364c65ba6d847f1eb 100644 (file)
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
@@ -78,8 +78,6 @@ public class MsaHeader 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
@@ -88,20 +86,14 @@ public class MsaHeader extends IInternalFrame {
 \r
     private JTextField jTextFieldSpecification = null;\r
 \r
-    private JTextField jTextFieldSpecificationVersion = null;\r
-\r
     private JButton jButtonOk = null;\r
 \r
     private JButton jButtonCancel = null;\r
 \r
     private JScrollPane jScrollPaneLicense = null;\r
 \r
-    private JScrollPane jScrollPaneCopyright = null;\r
-\r
     private JScrollPane jScrollPaneDescription = null;\r
 \r
-    private JLabel jLabelSpecVersion = null;\r
-\r
     private JLabel jLabelAbstract = null;\r
 \r
     private JTextField jTextFieldAbstract = null;\r
@@ -138,6 +130,8 @@ public class MsaHeader extends IInternalFrame {
 \r
     private JTextField jTextFieldAbstractURL = null;\r
 \r
+    private JTextField jTextFieldCopyright = null;\r
+\r
     /**\r
      This method initializes jTextFieldBaseName \r
      \r
@@ -161,7 +155,7 @@ public class MsaHeader 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
@@ -189,7 +183,7 @@ public class MsaHeader 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
@@ -211,20 +205,6 @@ public class MsaHeader 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
@@ -248,25 +228,11 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldSpecification() {\r
         if (jTextFieldSpecification == null) {\r
             jTextFieldSpecification = new JTextField();\r
-            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 340, 220, 20));\r
+            jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 280, 320, 20));\r
         }\r
         return jTextFieldSpecification;\r
     }\r
 \r
-    /**\r
-     This method initializes jTextFieldSpecificationVersion \r
-     \r
-     @return javax.swing.JTextField jTextFieldSpecificationVersion\r
-     \r
-     **/\r
-    private JTextField getJTextFieldSpecificationVersion() {\r
-        if (jTextFieldSpecificationVersion == null) {\r
-            jTextFieldSpecificationVersion = new JTextField();\r
-            jTextFieldSpecificationVersion.setBounds(new java.awt.Rectangle(400, 340, 80, 20));\r
-        }\r
-        return jTextFieldSpecificationVersion;\r
-    }\r
-\r
     /**\r
      This method initializes jButtonOk \r
      \r
@@ -315,22 +281,6 @@ public class MsaHeader 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
@@ -340,7 +290,7 @@ public class MsaHeader 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
@@ -356,7 +306,7 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldAbstract() {\r
         if (jTextFieldAbstract == null) {\r
             jTextFieldAbstract = new JTextField();\r
-            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 365, 200, 20));\r
+            jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 305, 320, 20));\r
         }\r
         return jTextFieldAbstract;\r
     }\r
@@ -370,7 +320,7 @@ public class MsaHeader extends IInternalFrame {
     private JComboBox getJComboBoxCompontentType() {\r
         if (jComboBoxCompontentType == null) {\r
             jComboBoxCompontentType = new JComboBox();\r
-            jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 415, 320, 20));\r
+            jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 380, 320, 20));\r
         }\r
         return jComboBoxCompontentType;\r
     }\r
@@ -384,7 +334,7 @@ public class MsaHeader extends IInternalFrame {
     private JComboBox getJComboBoxModuleType() {\r
         if (jComboBoxModuleType == null) {\r
             jComboBoxModuleType = new JComboBox();\r
-            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 390, 320, 20));\r
+            jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 355, 320, 20));\r
         }\r
         return jComboBoxModuleType;\r
     }\r
@@ -398,11 +348,25 @@ public class MsaHeader extends IInternalFrame {
     private JTextField getJTextFieldAbstractURL() {\r
         if (jTextFieldAbstractURL == null) {\r
             jTextFieldAbstractURL = new JTextField();\r
-            jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(390, 365, 90, 20));\r
+            jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(160, 330, 320, 20));\r
         }\r
         return jTextFieldAbstractURL;\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
@@ -444,10 +408,9 @@ public class MsaHeader 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.jTextFieldSpecification.setEnabled(!isView);\r
-            this.jTextFieldSpecificationVersion.setEnabled(!isView);\r
+            this.jTextFieldSpecification.setEnabled(!isView);            \r
             this.jTextFieldAbstract.setEnabled(!isView);\r
             this.jTextFieldAbstractURL.setEnabled(!isView);\r
             this.jComboBoxModuleType.setEnabled(!isView);\r
@@ -493,7 +456,7 @@ public class MsaHeader extends IInternalFrame {
                 this.jTextAreaLicense.setText(this.msaHeader.getLicense().getStringValue());\r
             }\r
             if (this.msaHeader.getCopyright() != null) {\r
-                this.jTextAreaCopyright.setText(this.msaHeader.getCopyright());\r
+                this.jTextFieldCopyright.setText(this.msaHeader.getCopyright());\r
             }\r
             if (this.msaHeader.getDescription() != null) {\r
                 this.jTextAreaDescription.setText(this.msaHeader.getDescription());\r
@@ -501,9 +464,6 @@ public class MsaHeader extends IInternalFrame {
             if (this.msaHeader.getSpecification() != null) {\r
                 this.jTextFieldSpecification.setText(this.msaHeader.getSpecification().getStringValue());\r
             }\r
-            if (this.msaHeader.getSpecification() != null) {\r
-                this.jTextFieldSpecificationVersion.setText(this.msaHeader.getSpecification().getVersion());\r
-            }\r
             if (this.msaHeader.getAbstract() != null) {\r
                 this.jTextFieldAbstract.setText(this.msaHeader.getAbstract().getStringValue());\r
                 this.jTextFieldAbstractURL.setText(this.msaHeader.getAbstract().getURL());\r
@@ -526,27 +486,23 @@ public class MsaHeader extends IInternalFrame {
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
             jLabelURL = new JLabel();\r
-            jLabelURL.setBounds(new java.awt.Rectangle(365, 365, 25, 20));\r
+            jLabelURL.setBounds(new java.awt.Rectangle(15,330,140,20));\r
             jLabelURL.setText("URL");\r
             jLabelCompontentType = new JLabel();\r
-            jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 415, 140, 20));\r
+            jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 380, 140, 20));\r
             jLabelCompontentType.setText("Compontent Type");\r
             jLabelModuleType = new JLabel();\r
-            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 390, 140, 20));\r
+            jLabelModuleType.setBounds(new java.awt.Rectangle(15, 355, 140, 20));\r
             jLabelModuleType.setText("Module Type");\r
             jLabelAbstract = new JLabel();\r
-            jLabelAbstract.setBounds(new java.awt.Rectangle(15, 365, 140, 20));\r
+            jLabelAbstract.setBounds(new java.awt.Rectangle(15, 305, 140, 20));\r
             jLabelAbstract.setText("Abstract");\r
-            jLabelSpecVersion = new JLabel();\r
-            jLabelSpecVersion.setBounds(new java.awt.Rectangle(382, 340, 15, 20));\r
-            jLabelSpecVersion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);\r
-            jLabelSpecVersion.setText("V");\r
             jLabelSpecification = new JLabel();\r
             jLabelSpecification.setText("Specification");\r
-            jLabelSpecification.setBounds(new java.awt.Rectangle(15, 340, 140, 20));\r
+            jLabelSpecification.setBounds(new java.awt.Rectangle(15, 280, 140, 20));\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
@@ -579,15 +535,12 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(jLabelDescription, null);\r
             jContentPane.add(jLabelSpecification, null);\r
             jContentPane.add(getJTextFieldSpecification(), null);\r
-            jContentPane.add(getJTextFieldSpecificationVersion(), null);\r
             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
             jContentPane.add(jLabelAbstract, null);\r
             jContentPane.add(getJTextFieldAbstract(), null);\r
-            jContentPane.add(jLabelSpecVersion, null);\r
             jContentPane.add(jLabelModuleType, null);\r
             jContentPane.add(jLabelCompontentType, null);\r
             jContentPane.add(getJComboBoxCompontentType(), null);\r
@@ -604,13 +557,13 @@ public class MsaHeader 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
             jStarLabel7 = new StarLabel();\r
-            jStarLabel7.setLocation(new java.awt.Point(0, 365));\r
+            jStarLabel7.setLocation(new java.awt.Point(0, 305));\r
             jStarLabel8 = new StarLabel();\r
-            jStarLabel8.setLocation(new java.awt.Point(0, 390));\r
+            jStarLabel8.setLocation(new java.awt.Point(0, 355));\r
             jStarLabel9 = new StarLabel();\r
-            jStarLabel9.setLocation(new java.awt.Point(0, 415));\r
+            jStarLabel9.setLocation(new java.awt.Point(0, 380));\r
 \r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
@@ -623,6 +576,7 @@ public class MsaHeader extends IInternalFrame {
             jContentPane.add(jStarLabel9, null);\r
             jContentPane.add(jLabelURL, null);\r
             jContentPane.add(getJTextFieldAbstractURL(), null);\r
+            jContentPane.add(getJTextFieldCopyright(), null);\r
         }\r
         return jContentPane;\r
     }\r
@@ -673,7 +627,7 @@ public class MsaHeader 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
@@ -701,7 +655,7 @@ public class MsaHeader extends IInternalFrame {
             Log.err("Incorrect data type for Abstract");\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
@@ -745,17 +699,15 @@ public class MsaHeader extends IInternalFrame {
                 this.msaHeader.setLicense(mLicense);\r
             }\r
 \r
-            this.msaHeader.setCopyright(this.jTextAreaCopyright.getText());\r
+            this.msaHeader.setCopyright(this.jTextFieldCopyright.getText());\r
             this.msaHeader.setDescription(this.jTextAreaDescription.getText());\r
 \r
             if (this.msaHeader.getSpecification() != null) {\r
                 this.msaHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());\r
-                this.msaHeader.getSpecification().setVersion(this.jTextFieldSpecificationVersion.getText());\r
             } else {\r
                 SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory\r
                                                                                                                 .newInstance();\r
                 mSpecification.setStringValue(this.jTextFieldSpecification.getText());\r
-                mSpecification.setVersion(this.jTextFieldSpecificationVersion.getText());\r
                 this.msaHeader.setSpecification(mSpecification);\r
             }\r
 \r