changed variable names from textfieldsomething to somethingtextfield
authorlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Sun, 27 Aug 2006 00:45:02 +0000 (00:45 +0000)
committerlhauch <lhauch@de2fecce-e211-0410-80a6-f3fac2684e05>
Sun, 27 Aug 2006 00:45:02 +0000 (00:45 +0000)
git-svn-id: https://edk2.tianocore.org/svn/edk2/trunk@1391 de2fecce-e211-0410-80a6-f3fac2684e05

edk2/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdHeader.java

index 4e996b1..5b5b4df 100644 (file)
@@ -29,7 +29,6 @@ import javax.swing.JScrollPane;
 import javax.swing.JTextArea;\r
 import javax.swing.JTextField;\r
 \r
-\r
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
@@ -47,6 +46,52 @@ import javax.swing.JCheckBox;
  **/\r
 public class SpdHeader extends IInternalFrame {\r
 \r
+    private int dialogWidth = 560;\r
+\r
+    private int labelColumn = 12;\r
+\r
+    private int labelWidth = 155;\r
+\r
+    private int buttonWidth = 60;\r
+\r
+    private final int valueColumn = 168;\r
+\r
+    private final int valueWidth = 320;\r
+    \r
+    private final int specWidth = 420;\r
+    \r
+    private int shortValueWidth = valueWidth - (buttonWidth + 5);\r
+\r
+    private final int oneRowHeight = 20;\r
+\r
+    private final int threeRowHeight = 60;\r
+\r
+    private final int fourRowHeight = 80;\r
+\r
+    private final int rowSep = 5;\r
+\r
+    private final int rowOne = 12;\r
+\r
+    private final int rowTwo = rowOne + oneRowHeight + rowSep;\r
+\r
+    private final int rowThree = rowTwo + oneRowHeight + rowSep;\r
+\r
+    private final int rowFour = rowThree + oneRowHeight + rowSep;\r
+\r
+    private final int rowFive = rowFour + threeRowHeight + rowSep;\r
+\r
+    private final int rowSix = rowFive + fourRowHeight + rowSep;\r
+\r
+    private final int rowSeven = rowSix + oneRowHeight + rowSep;\r
+\r
+    private final int rowEight = rowSeven + oneRowHeight + rowSep;\r
+\r
+    private final int rowNine = rowEight + fourRowHeight + rowSep;\r
+\r
+    private final int rowTen = rowNine + oneRowHeight + rowSep;\r
+\r
+    private int dialogHeight = rowTen + threeRowHeight;\r
+\r
     ///\r
     /// Define class Serial Version UID\r
     ///\r
@@ -56,48 +101,50 @@ public class SpdHeader extends IInternalFrame {
     //Define class members\r
     //\r
     static JFrame frame;\r
-    \r
+\r
     private JPanel jContentPane = null;\r
 \r
-    private JLabel jLabelBaseName = null;\r
+    private JLabel jPackageNameLabel = null;\r
 \r
-    private JTextField jTextFieldBaseName = null;\r
+    private JTextField jPackageNameTextField = null;\r
 \r
-    private JLabel jLabelGuid = null;\r
+    private JLabel jGuidLabel = null;\r
 \r
-    private JTextField jTextFieldGuid = null;\r
+    private JTextField jGuidTextField = null;\r
 \r
-    private JLabel jLabelVersion = null;\r
+    private JLabel jVersionLabel = null;\r
 \r
-    private JTextField jTextFieldVersion = null;\r
+    private JTextField jVersionTextField = null;\r
 \r
-    private JButton jButtonGenerateGuid = null;\r
+    private JButton jGenerateGuidButton = null;\r
 \r
-    private JLabel jLabelLicense = null;\r
+    private JLabel jLicenseLabel = null;\r
 \r
-    private JTextArea jTextAreaLicense = null;\r
+    private JTextArea jLicenseTextArea = null;\r
 \r
     private JLabel jLabelCopyright = null;\r
 \r
-    private JLabel jLabelDescription = null;\r
+    private JLabel jDescriptionLabel = null;\r
 \r
-    private JTextArea jTextAreaDescription = null;\r
+    private JTextArea jDescriptionTextArea = null;\r
 \r
-    private JLabel jLabelSpecification = null;\r
+    //    private JLabel jLabelSpecification = null;\r
 \r
-    private JTextField jTextFieldSpecification = null;\r
+    private JTextField jSpecificationTextField = null;\r
 \r
     private JButton jButtonOk = null;\r
 \r
     private JButton jButtonCancel = null;\r
 \r
-    private JScrollPane jScrollPaneLicense = null;\r
+    private JScrollPane jLicenseScrollPane = null;\r
 \r
-    private JScrollPane jScrollPaneDescription = null;\r
+    private JScrollPane jDescriptionScrollPane = null;\r
+    \r
+    private JScrollPane jCopyrightScrollPane = null;\r
 \r
-    private JLabel jLabelAbstract = null;\r
+    private JLabel jAbstractLabel = null;\r
 \r
-    private JTextField jTextFieldAbstract = null;\r
+    private JTextField jAbstractTextField = null;\r
 \r
     private StarLabel jStarLabel1 = null;\r
 \r
@@ -112,203 +159,206 @@ public class SpdHeader extends IInternalFrame {
     private StarLabel jStarLabel6 = null;\r
 \r
     private StarLabel jStarLabel7 = null;\r
+    \r
+    private StarLabel jStarLabel8 = null;\r
 \r
     private StarLabel jStarLabel9 = null;\r
-    \r
+\r
     private SpdFileContents sfc = null;\r
-    \r
-    private OpeningPackageType docConsole = null;\r
 \r
-    private JTextField jTextFieldCopyright = null;\r
-    \r
-    private JScrollPane topScrollPane = null;\r
+    private OpeningPackageType docConsole = null;\r
 \r
-    private JLabel jLabel = null;\r
+    private JTextArea jCopyrightTextArea = null;\r
 \r
-    private JTextField jTextFieldUrl = null;\r
+    private JScrollPane topScrollPane = null;\r
 \r
-    private StarLabel starLabel = null;\r
+    private JLabel jUrlLabel = null;\r
 \r
-    private StarLabel starLabel1 = null;\r
+    private JTextField jUrlTextField = null;\r
 \r
     private JCheckBox jCheckBoxRdOnly = null;\r
 \r
     private JCheckBox jCheckBoxRePkg = null;\r
 \r
     /**\r
-     This method initializes jTextFieldBaseName \r
+     This method initializes jPackageNameTextField \r
      \r
-     @return javax.swing.JTextField jTextFieldBaseName\r
+     @return javax.swing.JTextField jPackageNameTextField\r
      \r
      **/\r
-    private JTextField getJTextFieldBaseName() {\r
-        if (jTextFieldBaseName == null) {\r
-            jTextFieldBaseName = new JTextField();\r
-            jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));\r
-            jTextFieldBaseName.setPreferredSize(new java.awt.Dimension(320,20));\r
-            jTextFieldBaseName.addFocusListener(new FocusAdapter(){\r
-                public void focusLost(FocusEvent e){\r
-                    if (!DataValidation.isUiNameType(jTextFieldBaseName.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Package Name is NOT UiNameType.");\r
+    private JTextField getJPackageNameTextField() {\r
+        if (jPackageNameTextField == null) {\r
+            jPackageNameTextField = new JTextField();\r
+            jPackageNameTextField.setBounds(new java.awt.Rectangle(valueColumn, rowOne, valueWidth, oneRowHeight));\r
+            jPackageNameTextField.setPreferredSize(new java.awt.Dimension(valueWidth, oneRowHeight));\r
+            jPackageNameTextField.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isUiNameType(jPackageNameTextField.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Package Name must start with a letter.");\r
                         return;\r
                     }\r
-                    if (jTextFieldBaseName.getText().equals(sfc.getSpdHdrPkgName())) {\r
+                    if (jPackageNameTextField.getText().equals(sfc.getSpdHdrPkgName())) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sfc.setSpdHdrPkgName(jTextFieldBaseName.getText());\r
+                    sfc.setSpdHdrPkgName(jPackageNameTextField.getText());\r
                 }\r
             });\r
         }\r
-        return jTextFieldBaseName;\r
+        return jPackageNameTextField;\r
     }\r
 \r
     /**\r
-     This method initializes jTextFieldGui\r
+     This method initializes jGuidTextFiel\r
      \r
-     @return javax.swing.JTextField jTextFieldGuid\r
+     @return javax.swing.JTextField jGuidTextField\r
      \r
      **/\r
-    private JTextField getJTextFieldGuid() {\r
-        if (jTextFieldGuid == null) {\r
-            jTextFieldGuid = new JTextField();\r
-            jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));\r
-            jTextFieldGuid.setPreferredSize(new java.awt.Dimension(250,20));\r
-            jTextFieldGuid.addFocusListener(new FocusAdapter(){\r
-                public void focusLost(FocusEvent e){\r
-                    if (!DataValidation.isGuid(jTextFieldGuid.getText())) {\r
-                        JOptionPane.showMessageDialog(frame, "Guid is NOT GuidType.");\r
+    private JTextField getJGuidTextField() {\r
+        if (jGuidTextField == null) {\r
+            jGuidTextField = new JTextField();\r
+            jGuidTextField.setBounds(new java.awt.Rectangle(valueColumn, rowTwo, shortValueWidth, oneRowHeight));\r
+            jGuidTextField.setPreferredSize(new java.awt.Dimension(shortValueWidth, oneRowHeight));\r
+            jGuidTextField.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isGuid(jGuidTextField.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Guid must be in registry (8-4-4-4-12) format.");\r
                         return;\r
                     }\r
-                    if (jTextFieldGuid.getText().equals(sfc.getSpdHdrGuidValue())) {\r
+                    if (jGuidTextField.getText().equals(sfc.getSpdHdrGuidValue())) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sfc.setSpdHdrGuidValue(jTextFieldGuid.getText());\r
+                    sfc.setSpdHdrGuidValue(jGuidTextField.getText());\r
                 }\r
             });\r
         }\r
-        return jTextFieldGuid;\r
+        return jGuidTextField;\r
     }\r
 \r
     /**\r
-     This method initializes jTextFieldVersion \r
+     This method initializes jVersionTextField \r
      \r
-     @return javax.swing.JTextField jTextFieldVersion\r
+     @return javax.swing.JTextField jVersionTextField\r
      \r
      **/\r
-    private JTextField getJTextFieldVersion() {\r
-        if (jTextFieldVersion == null) {\r
-            jTextFieldVersion = new JTextField();\r
-            jTextFieldVersion.setBounds(new java.awt.Rectangle(160, 60, 320, 20));\r
-            jTextFieldVersion.setPreferredSize(new java.awt.Dimension(320,20));\r
-            jTextFieldVersion.addFocusListener(new FocusAdapter(){\r
-               public void focusLost(FocusEvent e){\r
-                   if (!DataValidation.isVersion(jTextFieldVersion.getText())) {\r
-                       JOptionPane.showMessageDialog(frame, "Version is NOT version type.");\r
-                       return;\r
-                   }\r
-                   if (jTextFieldVersion.getText().equals(sfc.getSpdHdrVer())){\r
-                       return;\r
-                   }\r
-                   docConsole.setSaved(false);\r
-                   sfc.setSpdHdrVer(jTextFieldVersion.getText());\r
-               } \r
+    private JTextField getJVersionTextField() {\r
+        if (jVersionTextField == null) {\r
+            jVersionTextField = new JTextField();\r
+            jVersionTextField.setBounds(new java.awt.Rectangle(valueColumn, rowThree, valueWidth, oneRowHeight));\r
+            jVersionTextField.setPreferredSize(new java.awt.Dimension(valueWidth, oneRowHeight));\r
+            jVersionTextField.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isVersion(jVersionTextField.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Version must start with a number.");\r
+                        return;\r
+                    }\r
+                    if (jVersionTextField.getText().equals(sfc.getSpdHdrVer())) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    sfc.setSpdHdrVer(jVersionTextField.getText());\r
+                }\r
             });\r
         }\r
-        return jTextFieldVersion;\r
+        return jVersionTextField;\r
     }\r
 \r
     /**\r
-     This method initializes jButtonGenerateGuid \r
+     This method initializes jGenerateGuidButton \r
      \r
-     @return javax.swing.JButton jButtonGenerateGuid\r
+     @return javax.swing.JButton jGenerateGuidButton\r
      \r
      **/\r
-    private JButton getJButtonGenerateGuid() {\r
-        if (jButtonGenerateGuid == null) {\r
-            jButtonGenerateGuid = new JButton();\r
-            jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));\r
-            jButtonGenerateGuid.setText("GEN");\r
-            jButtonGenerateGuid.addActionListener(this);\r
+    private JButton getJGenerateGuidButton() {\r
+        if (jGenerateGuidButton == null) {\r
+            jGenerateGuidButton = new JButton();\r
+            jGenerateGuidButton.setBounds(new java.awt.Rectangle(valueColumn + shortValueWidth + 5, rowTwo, buttonWidth, oneRowHeight));\r
+            jGenerateGuidButton.setText("GEN");\r
+            jGenerateGuidButton.addActionListener(this);\r
         }\r
-        return jButtonGenerateGuid;\r
+        return jGenerateGuidButton;\r
     }\r
 \r
     /**\r
-     This method initializes jTextAreaLicense \r
+     This method initializes jLicenseTextArea \r
      \r
-     @return javax.swing.JTextArea jTextAreaLicense\r
+     @return javax.swing.JTextArea jLicenseTextArea\r
      \r
      **/\r
-    private JTextArea getJTextAreaLicense() {\r
-        if (jTextAreaLicense == null) {\r
-            jTextAreaLicense = new JTextArea();\r
-            jTextAreaLicense.setText("");\r
-            jTextAreaLicense.setLineWrap(true);\r
-            jTextAreaLicense.addFocusListener(new FocusAdapter(){\r
-                public void focusLost(FocusEvent e){\r
-                    if (jTextAreaLicense.getText().length() == 0) {\r
-                        JOptionPane.showMessageDialog(frame, "License contents could NOT be empty.");\r
+    private JTextArea getJLicenseTextArea() {\r
+        if (jLicenseTextArea == null) {\r
+            jLicenseTextArea = new JTextArea();\r
+            //            jLicenseTextArea.setText("");\r
+            jLicenseTextArea.setLineWrap(true);\r
+            jLicenseTextArea.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (jLicenseTextArea.getText().length() == 0) {\r
+                        JOptionPane.showMessageDialog(frame, "License is a required field.");\r
                         return;\r
                     }\r
-                    if (jTextAreaLicense.getText().equals(sfc.getSpdHdrLicense())) {\r
+                    if (jLicenseTextArea.getText().equals(sfc.getSpdHdrLicense())) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sfc.setSpdHdrLicense(jTextAreaLicense.getText());\r
+                    sfc.setSpdHdrLicense(jLicenseTextArea.getText());\r
                 }\r
             });\r
         }\r
-        return jTextAreaLicense;\r
+        return jLicenseTextArea;\r
     }\r
 \r
     /**\r
-     This method initializes jTextAreaDescription \r
+     This method initializes jDescriptionTextArea \r
      \r
-     @return javax.swing.JTextArea jTextAreaDescription\r
+     @return javax.swing.JTextArea jDescriptionTextArea\r
      \r
      **/\r
-    private JTextArea getJTextAreaDescription() {\r
-        if (jTextAreaDescription == null) {\r
-            jTextAreaDescription = new JTextArea();\r
-            jTextAreaDescription.setLineWrap(true);\r
-            jTextAreaDescription.addFocusListener(new FocusAdapter(){\r
-                public void focusLost(FocusEvent e){\r
-                    if (jTextAreaDescription.getText().length() == 0) {\r
-                        JOptionPane.showMessageDialog(frame, "Description contents could NOT be empty.");\r
+    private JTextArea getJDescriptionTextArea() {\r
+        if (jDescriptionTextArea == null) {\r
+            jDescriptionTextArea = new JTextArea();\r
+            jDescriptionTextArea.setLineWrap(true);\r
+            jDescriptionTextArea.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (jDescriptionTextArea.getText().length() == 0) {\r
+                        JOptionPane\r
+                                   .showMessageDialog(frame,\r
+                                                      "Description is a required field, and should reflect the contents of the package.");\r
                         return;\r
                     }\r
-                    if (jTextAreaDescription.getText().equals(sfc.getSpdHdrDescription())) {\r
+                    if (jDescriptionTextArea.getText().equals(sfc.getSpdHdrDescription())) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sfc.setSpdHdrDescription(jTextAreaDescription.getText());\r
+                    sfc.setSpdHdrDescription(jDescriptionTextArea.getText());\r
                 }\r
             });\r
         }\r
-        return jTextAreaDescription;\r
+        return jDescriptionTextArea;\r
     }\r
 \r
     /**\r
-     This method initializes jTextFieldSpecification \r
+     This method initializes jSpecificationTextField \r
      \r
-     @return javax.swing.JTextField jTextFieldSpecification\r
+     @return javax.swing.JTextField jSpecificationTextField\r
      \r
      **/\r
-    private JTextField getJTextFieldSpecification() {\r
-        if (jTextFieldSpecification == null) {\r
-            jTextFieldSpecification = new JTextField();\r
-            jTextFieldSpecification.setBounds(new java.awt.Rectangle(161,369,320,20));\r
-            jTextFieldSpecification.setEditable(false);\r
-            jTextFieldSpecification.setPreferredSize(new java.awt.Dimension(320,20));\r
-            jTextFieldSpecification.addFocusListener(new FocusAdapter(){\r
-                public void focusLost(FocusEvent e){\r
-                    sfc.setSpdHdrSpec(jTextFieldSpecification.getText());\r
-                }\r
-            });\r
+    private JTextField getJSpecificationTextField() {\r
+        if (jSpecificationTextField == null) {\r
+            jSpecificationTextField = new JTextField();\r
+            jSpecificationTextField.setBounds(new java.awt.Rectangle(labelColumn, dialogHeight - 40, specWidth, oneRowHeight));\r
+            jSpecificationTextField.setEditable(false);\r
+            jSpecificationTextField.setPreferredSize(new java.awt.Dimension(specWidth, oneRowHeight));\r
+            jSpecificationTextField.setLocation(new java.awt.Point(2, dialogHeight - oneRowHeight));\r
+            jSpecificationTextField.setBorder(null);\r
+\r
+            //            jSpecificationTextField.addFocusListener(new FocusAdapter(){\r
+            //                public void focusLost(FocusEvent e){\r
+            //                    sfc.setSpdHdrSpec(jSpecificationTextField.getText());\r
+            //                }\r
+            //            });\r
         }\r
-        return jTextFieldSpecification;\r
+        return jSpecificationTextField;\r
     }\r
 \r
     /**\r
@@ -321,7 +371,7 @@ public class SpdHeader extends IInternalFrame {
         if (jButtonOk == null) {\r
             jButtonOk = new JButton();\r
             jButtonOk.setText("OK");\r
-            jButtonOk.setBounds(new java.awt.Rectangle(290, 445, 90, 20));\r
+            jButtonOk.setBounds(new java.awt.Rectangle(290, 445, 90, oneRowHeight));\r
             jButtonOk.setVisible(false);\r
             jButtonOk.addActionListener(this);\r
         }\r
@@ -338,7 +388,7 @@ public class SpdHeader extends IInternalFrame {
         if (jButtonCancel == null) {\r
             jButtonCancel = new JButton();\r
             jButtonCancel.setText("Cancel");\r
-            jButtonCancel.setBounds(new java.awt.Rectangle(390, 445, 90, 20));\r
+            jButtonCancel.setBounds(new java.awt.Rectangle(390, 445, 90, oneRowHeight));\r
             jButtonCancel.setVisible(false);\r
             jButtonCancel.addActionListener(this);\r
         }\r
@@ -346,92 +396,102 @@ public class SpdHeader extends IInternalFrame {
     }\r
 \r
     /**\r
-     This method initializes jScrollPaneLicens\r
+     This method initializes jLicenseScrollPan\r
      \r
-     @return javax.swing.JScrollPane jScrollPaneLicense\r
+     @return javax.swing.JScrollPane jLicenseScrollPane\r
      \r
      **/\r
-    private JScrollPane getJScrollPaneLicense() {\r
-        if (jScrollPaneLicense == null) {\r
-            jScrollPaneLicense = new JScrollPane();\r
-            jScrollPaneLicense.setBounds(new java.awt.Rectangle(161,144,320,80));\r
-            jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
-            jScrollPaneLicense.setPreferredSize(new java.awt.Dimension(320,80));\r
-            jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
+    private JScrollPane getJLicenseScrollPane() {\r
+        if (jLicenseScrollPane == null) {\r
+            jLicenseScrollPane = new JScrollPane();\r
+            jLicenseScrollPane.setBounds(new java.awt.Rectangle(valueColumn, rowFive, valueWidth, fourRowHeight));\r
+            jLicenseScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
+            jLicenseScrollPane.setPreferredSize(new java.awt.Dimension(valueWidth, fourRowHeight));\r
+            jLicenseScrollPane.setViewportView(getJLicenseTextArea());\r
         }\r
-        return jScrollPaneLicense;\r
+        return jLicenseScrollPane;\r
     }\r
 \r
     /**\r
-     This method initializes jScrollPaneDescription \r
+     This method initializes jDescriptionScrollPane \r
      \r
-     @return javax.swing.JScrollPane jScrollPaneDescription\r
+     @return javax.swing.JScrollPane jDescriptionScrollPane\r
      \r
      **/\r
-    private JScrollPane getJScrollPaneDescription() {\r
-        if (jScrollPaneDescription == null) {\r
-            jScrollPaneDescription = new JScrollPane();\r
-            jScrollPaneDescription.setBounds(new java.awt.Rectangle(160,280,320,80));\r
-            jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
-            jScrollPaneDescription.setViewportView(getJTextAreaDescription());\r
+    private JScrollPane getJDescriptionScrollPane() {\r
+        if (jDescriptionScrollPane == null) {\r
+            jDescriptionScrollPane = new JScrollPane();\r
+            jDescriptionScrollPane.setBounds(new java.awt.Rectangle(valueColumn, rowEight, valueWidth, fourRowHeight));\r
+            jDescriptionScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
+            jDescriptionScrollPane.setPreferredSize(new java.awt.Dimension(valueWidth, fourRowHeight));\r
+            jDescriptionScrollPane.setViewportView(getJDescriptionTextArea());\r
         }\r
-        return jScrollPaneDescription;\r
+        return jDescriptionScrollPane;\r
     }\r
 \r
     /**\r
-     This method initializes jTextFieldAbstract \r
+     This method initializes jAbstractTextField \r
      \r
-     @return javax.swing.JTextField jTextFieldAbstract\r
+     @return javax.swing.JTextField jAbstractTextField\r
      \r
      **/\r
-    private JTextField getJTextFieldAbstract() {\r
-        if (jTextFieldAbstract == null) {\r
-            jTextFieldAbstract = new JTextField();\r
-            jTextFieldAbstract.setBounds(new java.awt.Rectangle(161,256,320,20));\r
-            jTextFieldAbstract.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldAbstract.addFocusListener(new FocusAdapter(){\r
-                public void focusLost(FocusEvent e){\r
-                    if (!DataValidation.isAbstract(jTextFieldAbstract.getText())) {\r
+    private JTextField getJAbstractTextField() {\r
+        if (jAbstractTextField == null) {\r
+            jAbstractTextField = new JTextField();\r
+            jAbstractTextField.setBounds(new java.awt.Rectangle(valueColumn, rowSeven, valueWidth, oneRowHeight));\r
+            jAbstractTextField.setPreferredSize(new java.awt.Dimension(valueWidth, oneRowHeight));\r
+            jAbstractTextField.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isAbstract(jAbstractTextField.getText())) {\r
                         JOptionPane.showMessageDialog(frame, "Abstract could NOT be empty.");\r
                         return;\r
                     }\r
-                    if (jTextFieldAbstract.getText().equals(sfc.getSpdHdrAbs())) {\r
+                    if (jAbstractTextField.getText().equals(sfc.getSpdHdrAbs())) {\r
                         return;\r
                     }\r
                     docConsole.setSaved(false);\r
-                    sfc.setSpdHdrAbs(jTextFieldAbstract.getText());\r
+                    sfc.setSpdHdrAbs(jAbstractTextField.getText());\r
                 }\r
             });\r
         }\r
-        return jTextFieldAbstract;\r
+        return jAbstractTextField;\r
     }\r
 \r
+    private JScrollPane getCopyrightScrollPane() {\r
+        if (jCopyrightScrollPane == null) {\r
+            jCopyrightScrollPane = new JScrollPane();\r
+            jCopyrightScrollPane.setBounds(new java.awt.Rectangle(valueColumn, rowFour, valueWidth, threeRowHeight));\r
+            jCopyrightScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
+            jCopyrightScrollPane.setPreferredSize(new java.awt.Dimension(valueWidth, threeRowHeight));\r
+            jCopyrightScrollPane.setViewportView(getJCopyrightTextArea());\r
+        }\r
+        return jCopyrightScrollPane;\r
+    }\r
     /**\r
-      This method initializes jTextFieldCopyright      \r
-       \r
-      @return javax.swing.JTextField jTextFieldCopyright\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,86,320,48));\r
-            jTextFieldCopyright.setPreferredSize(new java.awt.Dimension(320,20));\r
-            jTextFieldCopyright.addFocusListener(new FocusAdapter(){\r
-               public void focusLost(FocusEvent e){\r
-                   if (!DataValidation.isCopyright(jTextFieldCopyright.getText())) {\r
-                       JOptionPane.showMessageDialog(frame, "Copyright contents could not be empty.");\r
-                       return;\r
-                   }\r
-                   if (jTextFieldCopyright.getText().equals(sfc.getSpdHdrCopyright())) {\r
-                       return;\r
-                   }\r
-                   docConsole.setSaved(false);\r
-                   sfc.setSpdHdrCopyright(jTextFieldCopyright.getText());\r
-               } \r
+    private JTextArea getJCopyrightTextArea() {\r
+        if (jCopyrightTextArea == null) {\r
+            jCopyrightTextArea = new JTextArea();\r
+            jCopyrightTextArea.setWrapStyleWord(true);\r
+            jCopyrightTextArea.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (!DataValidation.isCopyright(jCopyrightTextArea.getText())) {\r
+                        JOptionPane.showMessageDialog(frame, "Copyright must be entered.");\r
+                        return;\r
+                    }\r
+                    if (jCopyrightTextArea.getText().equals(sfc.getSpdHdrCopyright())) {\r
+                        return;\r
+                    }\r
+                    docConsole.setSaved(false);\r
+                    sfc.setSpdHdrCopyright(jCopyrightTextArea.getText());\r
+                }\r
             });\r
         }\r
-        return jTextFieldCopyright;\r
+        return jCopyrightTextArea;\r
     }\r
 \r
     /**\r
@@ -439,26 +499,26 @@ public class SpdHeader extends IInternalFrame {
      *         \r
      * @return javax.swing.JTextField  \r
      */\r
-    private JTextField getJTextFieldUrl() {\r
-        if (jTextFieldUrl == null) {\r
-            jTextFieldUrl = new JTextField();\r
-            jTextFieldUrl.setBounds(new java.awt.Rectangle(161,231,320,20));\r
-            jTextFieldUrl.setPreferredSize(new java.awt.Dimension(320, 20));\r
-            jTextFieldUrl.addFocusListener(new FocusAdapter(){\r
-               public void focusLost(FocusEvent e){\r
-                   if (jTextFieldUrl.getText().length() == 0 && sfc.getSpdHdrUrl() == null) {\r
-                       return;\r
-                   }\r
-                   if (jTextFieldUrl.getText().equals(sfc.getSpdHdrUrl())) {\r
-                       return;\r
-                   }\r
-                   sfc.setSpdHdrLicense(jTextAreaLicense.getText());\r
-                   sfc.setSpdHdrUrl(jTextFieldUrl.getText());\r
-                   docConsole.setSaved(false);\r
-               } \r
+    private JTextField getJUrlTextField() {\r
+        if (jUrlTextField == null) {\r
+            jUrlTextField = new JTextField();\r
+            jUrlTextField.setBounds(new java.awt.Rectangle(valueColumn, rowSix, valueWidth, oneRowHeight));\r
+            jUrlTextField.setPreferredSize(new java.awt.Dimension(valueWidth, oneRowHeight));\r
+            jUrlTextField.addFocusListener(new FocusAdapter() {\r
+                public void focusLost(FocusEvent e) {\r
+                    if (jUrlTextField.getText().length() == 0 && sfc.getSpdHdrUrl() == null) {\r
+                        return;\r
+                    }\r
+                    if (jUrlTextField.getText().equals(sfc.getSpdHdrUrl())) {\r
+                        return;\r
+                    }\r
+                    sfc.setSpdHdrLicense(jLicenseTextArea.getText());\r
+                    sfc.setSpdHdrUrl(jUrlTextField.getText());\r
+                    docConsole.setSaved(false);\r
+                }\r
             });\r
         }\r
-        return jTextFieldUrl;\r
+        return jUrlTextField;\r
     }\r
 \r
     /**\r
@@ -470,15 +530,15 @@ public class SpdHeader extends IInternalFrame {
         if (jCheckBoxRdOnly == null) {\r
             jCheckBoxRdOnly = new JCheckBox();\r
             jCheckBoxRdOnly.setText("Read Only");\r
-            jCheckBoxRdOnly.setLocation(new java.awt.Point(17,408));\r
-            jCheckBoxRdOnly.setSize(new java.awt.Dimension(138,20));\r
-            jCheckBoxRdOnly.setPreferredSize(new java.awt.Dimension(150,20));\r
+            jCheckBoxRdOnly.setLocation(new java.awt.Point(labelColumn, rowNine));\r
+            jCheckBoxRdOnly.setSize(new java.awt.Dimension(labelWidth, oneRowHeight));\r
+            // jCheckBoxRdOnly.setPreferredSize(new java.awt.Dimension(150, oneRowHeight));\r
             jCheckBoxRdOnly.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
                     if (docConsole != null) {\r
                         docConsole.setSaved(false);\r
                     }\r
-                    sfc.setSpdPkgDefsRdOnly(jCheckBoxRdOnly.isSelected()+"");\r
+                    sfc.setSpdPkgDefsRdOnly(jCheckBoxRdOnly.isSelected() + "");\r
                 }\r
             });\r
         }\r
@@ -493,15 +553,15 @@ public class SpdHeader extends IInternalFrame {
     private JCheckBox getJCheckBoxRePkg() {\r
         if (jCheckBoxRePkg == null) {\r
             jCheckBoxRePkg = new JCheckBox();\r
-            jCheckBoxRePkg.setLocation(new java.awt.Point(16,444));\r
+            jCheckBoxRePkg.setLocation(new java.awt.Point(labelColumn, rowTen));\r
             jCheckBoxRePkg.setText("RePackagable");\r
-            jCheckBoxRePkg.setSize(new java.awt.Dimension(140,20));\r
+            jCheckBoxRePkg.setSize(new java.awt.Dimension(labelWidth, oneRowHeight));\r
             jCheckBoxRePkg.addItemListener(new java.awt.event.ItemListener() {\r
                 public void itemStateChanged(java.awt.event.ItemEvent e) {\r
                     if (docConsole != null) {\r
                         docConsole.setSaved(false);\r
                     }\r
-                    sfc.setSpdPkgDefsRePkg(jCheckBoxRePkg.isSelected()+"");\r
+                    sfc.setSpdPkgDefsRePkg(jCheckBoxRePkg.isSelected() + "");\r
                 }\r
             });\r
         }\r
@@ -533,11 +593,12 @@ public class SpdHeader extends IInternalFrame {
         sfc = new SpdFileContents(inPsa);\r
         init(sfc);\r
     }\r
-    \r
-    public SpdHeader(OpeningPackageType opt){\r
+\r
+    public SpdHeader(OpeningPackageType opt) {\r
         this(opt.getXmlSpd());\r
         docConsole = opt;\r
     }\r
+\r
     /**\r
      This method initializes this\r
      \r
@@ -556,50 +617,48 @@ public class SpdHeader extends IInternalFrame {
      \r
      **/\r
     private void init(SpdFileContents sfc) {\r
-            if (sfc.getSpdHdrPkgName() != null) {\r
-                jTextFieldBaseName.setText(sfc.getSpdHdrPkgName());\r
-            }\r
-            if (sfc.getSpdHdrGuidValue() != null) {\r
-                jTextFieldGuid.setText(sfc.getSpdHdrGuidValue());\r
-            }\r
-            if (sfc.getSpdHdrVer() != null) {\r
-               jTextFieldVersion.setText(sfc.getSpdHdrVer());\r
-            }\r
-            if (sfc.getSpdHdrLicense() != null) {\r
-                jTextAreaLicense.setText(sfc.getSpdHdrLicense());\r
-            }\r
-            if (sfc.getSpdHdrUrl() != null) {\r
-                jTextFieldUrl.setText(sfc.getSpdHdrUrl());\r
-            }\r
-            if (sfc.getSpdHdrCopyright() != null) {\r
-                jTextFieldCopyright.setText(sfc.getSpdHdrCopyright());\r
-            }\r
-            if (sfc.getSpdHdrAbs() != null) {\r
-                jTextFieldAbstract.setText(sfc.getSpdHdrAbs());\r
-            }\r
-            if (sfc.getSpdHdrDescription() != null) {\r
-                jTextAreaDescription.setText(sfc.getSpdHdrDescription());\r
-            }\r
-            if (sfc.getSpdHdrSpec() != null) {\r
-                jTextFieldSpecification.setText(sfc.getSpdHdrSpec());\r
-            }\r
-            sfc.setSpdHdrSpec(jTextFieldSpecification.getText());\r
-            \r
-            if (!sfc.getSpdPkgDefsRdOnly().equals("true")) {\r
-                sfc.setSpdPkgDefsRdOnly("false");\r
-                jCheckBoxRdOnly.setSelected(false);\r
-            }\r
-            else{\r
-                jCheckBoxRdOnly.setSelected(true);\r
-            }\r
-            if (!sfc.getSpdPkgDefsRePkg().equals("true")) {\r
-                sfc.setSpdPkgDefsRePkg("false");\r
-                jCheckBoxRePkg.setSelected(false);\r
-            }\r
-            else{\r
-                jCheckBoxRePkg.setSelected(true);\r
-            }\r
-            \r
+        if (sfc.getSpdHdrPkgName() != null) {\r
+            jPackageNameTextField.setText(sfc.getSpdHdrPkgName());\r
+        }\r
+        if (sfc.getSpdHdrGuidValue() != null) {\r
+            jGuidTextField.setText(sfc.getSpdHdrGuidValue());\r
+        }\r
+        if (sfc.getSpdHdrVer() != null) {\r
+            jVersionTextField.setText(sfc.getSpdHdrVer());\r
+        }\r
+        if (sfc.getSpdHdrLicense() != null) {\r
+            jLicenseTextArea.setText(sfc.getSpdHdrLicense());\r
+        }\r
+        if (sfc.getSpdHdrUrl() != null) {\r
+            jUrlTextField.setText(sfc.getSpdHdrUrl());\r
+        }\r
+        if (sfc.getSpdHdrCopyright() != null) {\r
+            jCopyrightTextArea.setText(sfc.getSpdHdrCopyright());\r
+        }\r
+        if (sfc.getSpdHdrAbs() != null) {\r
+            jAbstractTextField.setText(sfc.getSpdHdrAbs());\r
+        }\r
+        if (sfc.getSpdHdrDescription() != null) {\r
+            jDescriptionTextArea.setText(sfc.getSpdHdrDescription());\r
+        }\r
+        if (sfc.getSpdHdrSpec() != null) {\r
+            jSpecificationTextField.setText(sfc.getSpdHdrSpec());\r
+        }\r
+        sfc.setSpdHdrSpec(jSpecificationTextField.getText());\r
+\r
+        if (!sfc.getSpdPkgDefsRdOnly().equals("true")) {\r
+            sfc.setSpdPkgDefsRdOnly("false");\r
+            jCheckBoxRdOnly.setSelected(false);\r
+        } else {\r
+            jCheckBoxRdOnly.setSelected(true);\r
+        }\r
+        if (!sfc.getSpdPkgDefsRePkg().equals("true")) {\r
+            sfc.setSpdPkgDefsRePkg("false");\r
+            jCheckBoxRePkg.setSelected(false);\r
+        } else {\r
+            jCheckBoxRePkg.setSelected(true);\r
+        }\r
+\r
     }\r
 \r
     /**\r
@@ -610,77 +669,55 @@ public class SpdHeader extends IInternalFrame {
      **/\r
     private JPanel getJContentPane() {\r
         if (jContentPane == null) {\r
-               starLabel1 = new StarLabel();\r
-               starLabel1.setBounds(new java.awt.Rectangle(2,443,10,20));\r
-               starLabel = new StarLabel();\r
-               starLabel.setBounds(new java.awt.Rectangle(2,407,10,20));\r
-               jLabel = new JLabel();\r
-               jLabel.setBounds(new java.awt.Rectangle(16,231,140,20));\r
-               jLabel.setText("URL");\r
-               jContentPane = new JPanel();\r
-            jContentPane.setLayout(null);\r
-            jContentPane.setLocation(new java.awt.Point(0, 0));\r
-            jContentPane.setPreferredSize(new java.awt.Dimension(500, 524));\r
-            jLabelAbstract = new JLabel();\r
-            jLabelAbstract.setBounds(new java.awt.Rectangle(16,281,140,20));\r
-            jLabelAbstract.setText("Description");\r
-            jLabelSpecification = new JLabel();\r
-            jLabelSpecification.setText("Specification");\r
-            jLabelSpecification.setBounds(new java.awt.Rectangle(16,369,140,20));\r
-            jLabelDescription = new JLabel();\r
-            jLabelDescription.setText("Abstract");\r
-            jLabelDescription.setBounds(new java.awt.Rectangle(16,256,140,20));\r
-            jLabelCopyright = new JLabel();\r
-            jLabelCopyright.setText("Copyright");\r
-            jLabelCopyright.setBounds(new java.awt.Rectangle(15,86,140,20));\r
-            jLabelLicense = new JLabel();\r
-            jLabelLicense.setText("License");\r
-            jLabelLicense.setBounds(new java.awt.Rectangle(16,147,140,20));\r
-            jLabelVersion = new JLabel();\r
-            jLabelVersion.setText("Version");\r
-            jLabelVersion.setBounds(new java.awt.Rectangle(15, 60, 140, 20));\r
-            jLabelGuid = new JLabel();\r
-            jLabelGuid.setPreferredSize(new java.awt.Dimension(25, 15));\r
-            jLabelGuid.setBounds(new java.awt.Rectangle(15, 35, 140, 20));\r
-            jLabelGuid.setText("Guid");\r
-            jLabelBaseName = new JLabel();\r
-            jLabelBaseName.setText("Package Name");\r
-            jLabelBaseName.setBounds(new java.awt.Rectangle(15, 10, 140, 20));\r
-            jContentPane.add(jLabelBaseName, null);\r
-            jContentPane.add(getJTextFieldBaseName(), null);\r
-            jContentPane.add(jLabelGuid, null);\r
-            jContentPane.add(getJTextFieldGuid(), null);\r
-            jContentPane.add(jLabelVersion, null);\r
-            jContentPane.add(getJTextFieldVersion(), null);\r
-            jContentPane.add(getJButtonGenerateGuid(), null);\r
-            jContentPane.add(jLabelLicense, null);\r
-            jContentPane.add(jLabelCopyright, null);\r
-            jContentPane.add(jLabelDescription, null);\r
-            jContentPane.add(jLabelSpecification, null);\r
-            jContentPane.add(getJTextFieldSpecification(), null);\r
-            jContentPane.add(getJButtonOk(), null);\r
-            jContentPane.add(getJButtonCancel(), null);\r
-            jContentPane.add(getJScrollPaneLicense(), null);\r
-            jContentPane.add(getJScrollPaneDescription(), null);\r
-            jContentPane.add(jLabelAbstract, null);\r
-            jContentPane.add(getJTextFieldAbstract(), null);\r
             jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
+            jStarLabel1.setLocation(new java.awt.Point(2, rowOne));\r
             jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(0, 35));\r
+            jStarLabel2.setLocation(new java.awt.Point(2, rowTwo));\r
             jStarLabel3 = new StarLabel();\r
-            jStarLabel3.setLocation(new java.awt.Point(0, 60));\r
+            jStarLabel3.setLocation(new java.awt.Point(2, rowThree));\r
             jStarLabel4 = new StarLabel();\r
-            jStarLabel4.setLocation(new java.awt.Point(1,147));\r
+            jStarLabel4.setLocation(new java.awt.Point(2, rowFour));\r
             jStarLabel5 = new StarLabel();\r
-            jStarLabel5.setLocation(new java.awt.Point(0,86));\r
+            jStarLabel5.setLocation(new java.awt.Point(2, rowFive));\r
             jStarLabel6 = new StarLabel();\r
-            jStarLabel6.setLocation(new java.awt.Point(1,256));\r
+            jStarLabel6.setLocation(new java.awt.Point(2, rowSeven));\r
             jStarLabel7 = new StarLabel();\r
-            jStarLabel7.setLocation(new java.awt.Point(1,369));\r
-            jStarLabel7.setEnabled(false);\r
+            jStarLabel7.setLocation(new java.awt.Point(2, rowEight));\r
+            jStarLabel8 = new StarLabel();\r
+            jStarLabel8.setLocation(new java.awt.Point(2, rowNine));\r
             jStarLabel9 = new StarLabel();\r
-            jStarLabel9.setLocation(new java.awt.Point(1,281));\r
+            jStarLabel9.setLocation(new java.awt.Point(2, rowTen));\r
+\r
+            jPackageNameLabel = new JLabel();\r
+            jPackageNameLabel.setText("Package Name");\r
+            jPackageNameLabel.setBounds(new java.awt.Rectangle(labelColumn, rowOne, labelWidth, oneRowHeight));\r
+            jGuidLabel = new JLabel();\r
+            jGuidLabel.setBounds(new java.awt.Rectangle(labelColumn, rowTwo, labelWidth, oneRowHeight));\r
+            jGuidLabel.setText("Guid");\r
+            jVersionLabel = new JLabel();\r
+            jVersionLabel.setText("Version");\r
+            jVersionLabel.setBounds(new java.awt.Rectangle(labelColumn, rowThree, labelWidth, oneRowHeight));\r
+            jLabelCopyright = new JLabel();\r
+            jLabelCopyright.setText("Copyright");\r
+            jLabelCopyright.setBounds(new java.awt.Rectangle(labelColumn, rowFour, labelWidth, oneRowHeight));\r
+            jLicenseLabel = new JLabel();\r
+            jLicenseLabel.setText("License");\r
+            jLicenseLabel.setBounds(new java.awt.Rectangle(labelColumn, rowFive, labelWidth, oneRowHeight));\r
+            jUrlLabel = new JLabel();\r
+            jUrlLabel.setBounds(new java.awt.Rectangle(labelColumn, rowSix, labelWidth, oneRowHeight));\r
+            jUrlLabel.setText("URL");\r
+            jAbstractLabel = new JLabel();\r
+            jAbstractLabel.setBounds(new java.awt.Rectangle(labelColumn, rowSeven, labelWidth, oneRowHeight));\r
+            jAbstractLabel.setText("Abstract");\r
+            jDescriptionLabel = new JLabel();\r
+            jDescriptionLabel.setText("Description");\r
+            jDescriptionLabel.setBounds(new java.awt.Rectangle(labelColumn, rowEight, labelWidth, oneRowHeight));\r
+\r
+            jContentPane = new JPanel();\r
+            jContentPane.setLayout(null);\r
+            jContentPane.setLocation(new java.awt.Point(0, 0));\r
+            jContentPane.setPreferredSize(new java.awt.Dimension(dialogWidth - 20, dialogHeight - 20));\r
+\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(jStarLabel3, null);\r
@@ -688,15 +725,34 @@ public class SpdHeader extends IInternalFrame {
             jContentPane.add(jStarLabel5, null);\r
             jContentPane.add(jStarLabel6, null);\r
             jContentPane.add(jStarLabel7, null);\r
+            jContentPane.add(jStarLabel8, null);\r
             jContentPane.add(jStarLabel9, null);\r
-            jContentPane.add(getJTextFieldCopyright(), null);\r
 \r
-            jContentPane.add(jLabel, null);\r
-            jContentPane.add(getJTextFieldUrl(), null);\r
-            jContentPane.add(starLabel, null);\r
-            jContentPane.add(starLabel1, null);\r
+            jContentPane.add(jPackageNameLabel, null);\r
+            jContentPane.add(getJPackageNameTextField(), null);\r
+            jContentPane.add(jGuidLabel, null);\r
+            jContentPane.add(getJGuidTextField(), null);\r
+            jContentPane.add(jVersionLabel, null);\r
+            jContentPane.add(getJVersionTextField(), null);\r
+            jContentPane.add(getJGenerateGuidButton(), null);\r
+            jContentPane.add(jLabelCopyright, null);\r
+            jContentPane.add(getCopyrightScrollPane(), null);\r
+            jContentPane.add(jLicenseLabel, null);\r
+            jContentPane.add(getJLicenseScrollPane(), null);\r
+            jContentPane.add(jUrlLabel, null);\r
+            jContentPane.add(getJUrlTextField(), null);\r
+            jContentPane.add(jAbstractLabel, null);\r
+            jContentPane.add(getJAbstractTextField(), null);\r
+            jContentPane.add(jDescriptionLabel, null);\r
+            jContentPane.add(getJDescriptionScrollPane(), null);\r
+\r
+//            jContentPane.add(getJButtonOk(), null);\r
+//            jContentPane.add(getJButtonCancel(), null);\r
+\r
             jContentPane.add(getJCheckBoxRdOnly(), null);\r
             jContentPane.add(getJCheckBoxRePkg(), null);\r
+            jContentPane.add(getJSpecificationTextField(), null);\r
+\r
         }\r
         return jContentPane;\r
     }\r
@@ -708,46 +764,46 @@ public class SpdHeader extends IInternalFrame {
      *\r
      */\r
     public void actionPerformed(ActionEvent arg0) {\r
-        \r
-        if (arg0.getSource() == jButtonGenerateGuid) {\r
+\r
+        if (arg0.getSource() == jGenerateGuidButton) {\r
             //ToDo: invoke GuidValueEditor\r
-            jTextFieldGuid.setText(Tools.generateUuidString());\r
+            jGuidTextField.setText(Tools.generateUuidString());\r
             docConsole.setSaved(false);\r
-            sfc.setSpdHdrGuidValue(jTextFieldGuid.getText());\r
+            sfc.setSpdHdrGuidValue(jGuidTextField.getText());\r
         }\r
     }\r
-    \r
+\r
     /**\r
      This method initializes Package type and Compontent type\r
      \r
      **/\r
     private void initFrame() {\r
-        \r
+\r
     }\r
 \r
-       /* (non-Javadoc)\r
-        * @see java.awt.event.ComponentListener#componentResized(java.awt.event.ComponentEvent)\r
-        \r
-        * Override componentResized to resize all components when frame's size is changed\r
-        */\r
-       public void componentResized(ComponentEvent arg0) {\r
-        int intPreferredWidth = 500;\r
+    /* (non-Javadoc)\r
+     * @see java.awt.event.ComponentListener#componentResized(java.awt.event.ComponentEvent)\r
+     * \r
+     * Override componentResized to resize all components when frame's size is changed\r
+     */\r
+    public void componentResized(ComponentEvent arg0) {\r
+        int intPreferredWidth = dialogWidth;\r
         int intCurrentWidth = this.getJContentPane().getWidth();\r
-        \r
-        Tools.resizeComponentWidth(this.jTextFieldBaseName, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldGuid, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldVersion, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldUrl, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jScrollPaneLicense, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldCopyright, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jScrollPaneDescription, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldSpecification, intCurrentWidth,intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldAbstract, intCurrentWidth,intPreferredWidth);\r
-        Tools.relocateComponentX(this.jButtonGenerateGuid, intCurrentWidth, jButtonGenerateGuid.getWidth(),30);\r
-       }\r
+\r
+//        Tools.resizeComponentWidth(this.jPackageNameTextField, intCurrentWidth, intPreferredWidth);\r
+//        Tools.resizeComponentWidth(this.jGuidTextField, intCurrentWidth, intPreferredWidth);\r
+//        Tools.resizeComponentWidth(this.jVersionTextField, intCurrentWidth, intPreferredWidth);\r
+        Tools.resizeComponentWidth(this.jUrlTextField, intCurrentWidth, intPreferredWidth);\r
+        Tools.resizeComponentWidth(this.jLicenseScrollPane, intCurrentWidth, intPreferredWidth);\r
+        Tools.resizeComponentWidth(this.jCopyrightTextArea, intCurrentWidth, intPreferredWidth);\r
+        Tools.resizeComponentWidth(this.jDescriptionScrollPane, intCurrentWidth, intPreferredWidth);\r
+        //        Tools.resizeComponentWidth(this.jSpecificationTextField, intCurrentWidth,intPreferredWidth);\r
+        Tools.resizeComponentWidth(this.jAbstractTextField, intCurrentWidth, intPreferredWidth);\r
+//        Tools.relocateComponentX(this.jGenerateGuidButton, intCurrentWidth, jGenerateGuidButton.getWidth(), 30);\r
+    }\r
 \r
     private JScrollPane getTopScrollPane() {\r
-        if (topScrollPane == null){\r
+        if (topScrollPane == null) {\r
             topScrollPane = new JScrollPane();\r
             topScrollPane.setViewportView(getJContentPane());\r
         }\r