Fixed display for OS X and removed Recommended fields

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index 416afcd51b66a9f7389b1d634457e02b0c5dc09d..e322732cc4deeb1d2bda951b378e1dd31069f592 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -27,6 +27,7 @@ import javax.swing.JOptionPane;
 import javax.swing.JPanel;\r
 import javax.swing.JTable;\r
 import javax.swing.JTextField;\r
+import javax.swing.JTextArea;\r
 import javax.swing.JComboBox;\r
 import javax.swing.JLabel;\r
 import javax.swing.JScrollPane;\r
@@ -42,6 +43,7 @@ import javax.swing.event.TableModelListener;
 import javax.swing.table.DefaultTableModel;\r
 import javax.swing.table.TableModel;\r
 import org.tianocore.PackageSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
 import org.tianocore.frameworkwizard.common.GlobalData;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
@@ -74,11 +76,11 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private JPanel jContentPane = null;\r
 \r
-    private JTextField jTextFieldClass = null;\r
+    private JTextField jTextFieldAddClass = null;\r
 \r
     private JComboBox jComboBoxSelect = null;\r
 \r
-    private JScrollPane jScrollPane = null;\r
+    private JScrollPane jScrollPaneTable = null;\r
 \r
     private JButton jButtonAdd = null;\r
 \r
@@ -92,9 +94,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private JButton jButtonBrowse = null;\r
     \r
-    private StarLabel jStarLabel1 = null;\r
+    private StarLabel starLabel1 = null;\r
     \r
-    private StarLabel jStarLabel2 = null;\r
+    private StarLabel starLabel3 = null;\r
     \r
     private SpdFileContents sfc = null;\r
     \r
@@ -106,11 +108,13 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     \r
     private int selectedRow = -1;\r
 \r
-    private StarLabel starLabel = null;\r
+    private StarLabel starLabel2 = null;\r
 \r
     private JLabel jLabel2HelpText = null;\r
 \r
-    private JTextField jTextFieldHelp = null;\r
+    private JTextArea jTextAreaHelp = null;\r
+\r
+    private JScrollPane jHelpTextScrollPane = null;\r
 \r
     private JLabel jLabel3RecInstName = null;\r
 \r
@@ -141,7 +145,31 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private int cnRecInstVer = 4;\r
     private int cnSupArch = 5;\r
     private int cnSupMod = 6;\r
-    \r
+\r
+    private final int shortLabel = 90;\r
+    private final int longLabel = 220;\r
+    private final int labelCol = 12;\r
+    private final int shortValueCol = labelCol + shortLabel + 6;\r
+    private final int longValueCol = labelCol + longLabel + 6;\r
+    private final int longValueWidth = 347;\r
+    private final int shortWidth = 140;\r
+    private final int medWidth = 240;\r
+   \r
+    private final int buttonWidth = 99;\r
+\r
+    private final int addButtonCol = shortValueCol + 10;\r
+    private final int removeButtonCol = addButtonCol + buttonWidth + 10;\r
+    private final int removeAllButtonCol = removeButtonCol + buttonWidth + 10;\r
+\r
+    private final int rowOne = 12;\r
+    private final int rowTwo = rowOne + 25;\r
+    private final int rowThree = rowTwo + 60 + 25;\r
+    private final int rowFour = rowThree + 25;\r
+    private final int rowFive = rowFour + 40 + 25;\r
+    private final int rowSix = rowFive + 40 + 25;\r
+    private final int rowSeven = rowSix;\r
+    private final int rowEight = rowSeven + 30;\r
+\r
     HashMap<String, String> libNameGuidMap = new HashMap<String, String>();\r
 \r
 \r
@@ -156,18 +184,18 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     }\r
 \r
     /**\r
-      This method initializes jTextFieldAdd    \r
+      This method initializes jTextFieldAddClass       \r
        \r
       @return javax.swing.JTextField   \r
      **/\r
-    private JTextField getJTextFieldClass() {\r
-        if (jTextFieldClass == null) {\r
-            jTextFieldClass = new JTextField();\r
-            jTextFieldClass.setBounds(new java.awt.Rectangle(122,6,390,20));\r
-            jTextFieldClass.setPreferredSize(new java.awt.Dimension(260,20));\r
-            jTextFieldClass.setEnabled(true);\r
-        }\r
-        return jTextFieldClass;\r
+    private JTextField getJTextFieldAddClass() {\r
+        if (jTextFieldAddClass == null) {\r
+            jTextFieldAddClass = new JTextField();\r
+            jTextFieldAddClass.setBounds(new java.awt.Rectangle(shortValueCol,rowOne,longValueWidth,20));\r
+            jTextFieldAddClass.setPreferredSize(new java.awt.Dimension(longValueWidth,20));\r
+            jTextFieldAddClass.setEnabled(true);\r
+        }\r
+        return jTextFieldAddClass;\r
     }\r
 \r
     /**\r
@@ -187,20 +215,20 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     }\r
 \r
     /**\r
-      This method initializes jScrollPane      \r
+      This method initializes jScrollPaneTable \r
        \r
       @return javax.swing.JScrollPane  \r
 \r
       Used for the Table of Library Classes that are provided by this package\r
 \r
      **/\r
-    private JScrollPane getJScrollPane() {\r
-        if (jScrollPane == null) {\r
-            jScrollPane = new JScrollPane();\r
-            jScrollPane.setBounds(new java.awt.Rectangle(12,351,400,253));\r
-            jScrollPane.setViewportView(getJTable());\r
+    private JScrollPane getJScrollPaneTable() {\r
+        if (jScrollPaneTable == null) {\r
+            jScrollPaneTable = new JScrollPane();\r
+            jScrollPaneTable.setBounds(new java.awt.Rectangle(labelCol,rowEight,400,253));\r
+            jScrollPaneTable.setViewportView(getJTable());\r
         }\r
-        return jScrollPane;\r
+        return jScrollPaneTable;\r
     }\r
 \r
     /**\r
@@ -354,8 +382,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         if (jButtonAdd == null) {\r
             jButtonAdd = new JButton();\r
             jButtonAdd.setText("Add");\r
-            jButtonAdd.setSize(new java.awt.Dimension(99,20));\r
-            jButtonAdd.setBounds(new java.awt.Rectangle(321,326,99,20));\r
+            jButtonAdd.setSize(new java.awt.Dimension(buttonWidth,20));\r
+            jButtonAdd.setBounds(new java.awt.Rectangle(addButtonCol,rowSeven,buttonWidth,20));\r
             jButtonAdd.addActionListener(this);\r
         }\r
         return jButtonAdd;\r
@@ -370,8 +398,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         if (jButtonRemove == null) {\r
             jButtonRemove = new JButton();\r
             jButtonRemove.setText("Remove");\r
-            jButtonRemove.setSize(new java.awt.Dimension(99,20));\r
-            jButtonRemove.setBounds(new java.awt.Rectangle(424,326,99,20));\r
+            jButtonRemove.setSize(new java.awt.Dimension(buttonWidth,20));\r
+            jButtonRemove.setBounds(new java.awt.Rectangle(removeButtonCol,rowSeven,buttonWidth,20));\r
             jButtonRemove.addActionListener(this);\r
         }\r
         return jButtonRemove;\r
@@ -386,8 +414,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         if (jButtonRemoveAll == null) {\r
             jButtonRemoveAll = new JButton();\r
             jButtonRemoveAll.setText("Remove All");\r
-            jButtonRemoveAll.setSize(new java.awt.Dimension(99,20));\r
-            jButtonRemoveAll.setBounds(new java.awt.Rectangle(527,326,99,20));\r
+            jButtonRemoveAll.setSize(new java.awt.Dimension(buttonWidth,20));\r
+            jButtonRemoveAll.setBounds(new java.awt.Rectangle(removeAllButtonCol,rowSeven,buttonWidth,20));\r
             jButtonRemoveAll.addActionListener(this);\r
         }\r
         return jButtonRemoveAll;\r
@@ -431,7 +459,6 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
                 }\r
             }\r
         });\r
-        initFrame();\r
     }\r
 \r
     private void init(SpdFileContents sfc) {\r
@@ -457,7 +484,6 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private JScrollPane getJContentPane(){\r
         if (topScrollPane == null){\r
           topScrollPane = new JScrollPane();\r
-//          topScrollPane.setSize(new java.awt.Dimension(634,590));\r
           topScrollPane.setViewportView(getJContentPane1());\r
         }\r
         return topScrollPane;\r
@@ -470,53 +496,45 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private JPanel getJContentPane1() {\r
         if (jContentPane == null) {\r
             // Library Class\r
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(1,7));\r
+            starLabel1 = new StarLabel();\r
+            starLabel1.setLocation(new java.awt.Point(1,rowOne));\r
             jLabel1ClassName = new JLabel();\r
-            jLabel1ClassName.setBounds(new java.awt.Rectangle(16,6,82,20));\r
+            jLabel1ClassName.setBounds(new java.awt.Rectangle(labelCol,rowOne,shortLabel,20));\r
             jLabel1ClassName.setText("Library Class");\r
 \r
             // Help Text\r
-            starLabel = new StarLabel();\r
-            starLabel.setBounds(new java.awt.Rectangle(1,33,10,20));\r
+            starLabel2 = new StarLabel();\r
+            starLabel2.setBounds(new java.awt.Rectangle(1,rowTwo,10,20));\r
             jLabel2HelpText = new JLabel();\r
-            jLabel2HelpText.setBounds(new java.awt.Rectangle(16,33,82,20));\r
+            jLabel2HelpText.setBounds(new java.awt.Rectangle(labelCol,rowTwo,shortLabel,20));\r
             jLabel2HelpText.setText("Help Text");\r
 \r
             // Header File\r
-            jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(1,74));\r
+            starLabel3 = new StarLabel();\r
+            starLabel3.setLocation(new java.awt.Point(1,rowThree));\r
             jLabelHdr = new JLabel();\r
-            jLabelHdr.setBounds(new java.awt.Rectangle(14,74,199,22));\r
+            jLabelHdr.setBounds(new java.awt.Rectangle(labelCol,rowThree,longLabel,20));\r
             jLabelHdr.setText("Include Header for Specified Class");\r
 \r
             jLabel6SupModList = new JLabel();\r
-            jLabel6SupModList.setBounds(new java.awt.Rectangle(16,252,108,16));\r
-            jLabel6SupModList.setText("Supported Module");\r
+            jLabel6SupModList.setBounds(new java.awt.Rectangle(labelCol,rowFive,longLabel,20));\r
+            jLabel6SupModList.setText("Supported Module Types");\r
             jLabel6SupModList.setEnabled(true);\r
 \r
             jLabel5SupArchList = new JLabel();\r
-            jLabel5SupArchList.setBounds(new java.awt.Rectangle(15,169,93,16));\r
-            jLabel5SupArchList.setText("Supported Arch");\r
+            jLabel5SupArchList.setBounds(new java.awt.Rectangle(labelCol,rowFour,longLabel,20));\r
+            jLabel5SupArchList.setText("Supported Architectures");\r
             jLabel5SupArchList.setEnabled(true);\r
-            jLabel4RecInstVer = new JLabel();\r
-            jLabel4RecInstVer.setBounds(new java.awt.Rectangle(16,138,196,16));\r
-            jLabel4RecInstVer.setEnabled(true);\r
-            jLabel4RecInstVer.setText("Recommended Instance Version");\r
-            jLabel3RecInstName = new JLabel();\r
-            jLabel3RecInstName.setBounds(new java.awt.Rectangle(17,112,195,16));\r
-            jLabel3RecInstName.setEnabled(true);\r
-            jLabel3RecInstName.setText("Recommended Instance Name");\r
-            \r
+\r
             jContentPane = new JPanel();\r
             jContentPane.setPreferredSize(new Dimension(680, 600));\r
             jContentPane.setLayout(null);\r
             jContentPane.add(jLabelHdr, null);\r
-            jContentPane.add(jStarLabel1, null);\r
-            jContentPane.add(jStarLabel2, null);\r
-            jContentPane.add(getJTextFieldClass(), null);\r
+            jContentPane.add(starLabel1, null);\r
+            jContentPane.add(starLabel3, null);\r
+            jContentPane.add(getJTextFieldAddClass(), null);\r
             jContentPane.add(getJComboBoxSelect(), null);\r
-            jContentPane.add(getJScrollPane(), null);\r
+            jContentPane.add(getJScrollPaneTable(), null);\r
             jContentPane.add(getJButtonAdd(), null);\r
             jContentPane.add(getJButtonRemove(), null);\r
             jContentPane.add(getJButtonRemoveAll(), null);\r
@@ -524,70 +542,21 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jContentPane.add(getJTextFieldHdr(), null);\r
             jContentPane.add(getJButtonBrowse(), null);\r
             jContentPane.add(jLabel1ClassName, null);\r
-            jContentPane.add(starLabel, null);\r
+            jContentPane.add(starLabel2, null);\r
             jContentPane.add(jLabel2HelpText, null);\r
-            jContentPane.add(getJTextFieldHelp(), null);\r
+            jContentPane.add(getJHelpTextScrollPane(), null);\r
 \r
-            jContentPane.add(jLabel3RecInstName, null);\r
-            jContentPane.add(getJTextField1RecInstName(), null);\r
-            jContentPane.add(jLabel4RecInstVer, null);\r
-            jContentPane.add(getJTextField2RecInstVer(), null);\r
             jContentPane.add(jLabel5SupArchList, null);\r
             jContentPane.add(jLabel6SupModList, null);\r
             \r
             jContentPane.add(getJScrollPaneModules(), null);\r
             jContentPane.add(getJScrollPane1Arch(), null);\r
-            jContentPane.add(getJComboBox(), null);\r
             \r
         }\r
         \r
         return jContentPane;\r
     }\r
 \r
-    /**\r
-     fill ComboBoxes with pre-defined contents\r
-    **/\r
-    private void initFrame() {\r
-        jComboBoxSelect.addItem("BaseCpuICacheFlush");\r
-        jComboBoxSelect.addItem("BaseDebugLibNull");\r
-        jComboBoxSelect.addItem("BaseDebugLibReportStatusCode");\r
-        jComboBoxSelect.addItem("BaseIoLibIntrinsic");\r
-        jComboBoxSelect.addItem("BaseLib");\r
-        jComboBoxSelect.addItem("BaseMemoryLib");\r
-        jComboBoxSelect.addItem("BaseMemoryLibMmx");\r
-        jComboBoxSelect.addItem("BaseMemoryLibSse2");\r
-        jComboBoxSelect.addItem("BasePeCoffGetEntryPointLib");\r
-        jComboBoxSelect.addItem("BasePeCoffLib");\r
-        jComboBoxSelect.addItem("BasePrintLib");\r
-        jComboBoxSelect.addItem("BaseReportStatusCodeLibNull");\r
-        jComboBoxSelect.addItem("CommonPciCf8Lib");\r
-        jComboBoxSelect.addItem("CommonPciExpressLib");\r
-        jComboBoxSelect.addItem("CommonPciLibCf8");\r
-        jComboBoxSelect.addItem("CommonPciLibPciExpress");\r
-        jComboBoxSelect.addItem("DxeCoreEntryPoint");\r
-        jComboBoxSelect.addItem("DxeHobLib");\r
-        jComboBoxSelect.addItem("DxeIoLibCpuIo");\r
-        jComboBoxSelect.addItem("DxeLib");\r
-        jComboBoxSelect.addItem("DxePcdLib");\r
-        jComboBoxSelect.addItem("DxeReportStatusCodeLib");\r
-        jComboBoxSelect.addItem("DxeServicesTableLib");\r
-        jComboBoxSelect.addItem("PeiCoreEntryPoint");\r
-        jComboBoxSelect.addItem("PeiMemoryLib");\r
-        jComboBoxSelect.addItem("PeimEntryPoint");\r
-        jComboBoxSelect.addItem("PeiReportStatusCodeLib");\r
-        jComboBoxSelect.addItem("PeiServicesTablePointerLib");\r
-        jComboBoxSelect.addItem("PeiServicesTablePointerLibMm7");\r
-        jComboBoxSelect.addItem("UefiDebugLibConOut");\r
-        jComboBoxSelect.addItem("UefiDebugLibStdErr");\r
-        jComboBoxSelect.addItem("UefiDriverEntryPointMultiple");\r
-        jComboBoxSelect.addItem("UefiDriverEntryPointSingle");\r
-        jComboBoxSelect.addItem("UefiDriverEntryPointSingleUnload");\r
-        jComboBoxSelect.addItem("UefiDriverModelLib");\r
-        jComboBoxSelect.addItem("UefiDriverModelLibNoConfigNoDiag");\r
-        jComboBoxSelect.addItem("UefiLib");\r
-        jComboBoxSelect.addItem("UefiMemoryLib");\r
-\r
-    }\r
 \r
     /* (non-Javadoc)\r
      * @see java.awt.event.ActionListener#actionPerformed(java.awt.event.ActionEvent)\r
@@ -599,9 +568,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             //ToDo: check before add\r
             // LAH WAS String[] row = {null, null, null, jComboBox.getSelectedItem()+"", jTextField2RecInstVer.getText(), null, null};\r
             String[] row = {null, null, null, null, null, null, null};\r
-            row[cnClassName] = jTextFieldClass.getText();\r
+            row[cnClassName] = jTextFieldAddClass.getText();\r
             row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/');\r
-            row[cnHelpText] = jTextFieldHelp.getText();\r
+            row[cnHelpText] = jTextAreaHelp.getText();\r
             row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
             row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
             row[cnSupArch] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
@@ -701,8 +670,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private JTextField getJTextFieldHdr() {\r
         if (jTextFieldHdr == null) {\r
             jTextFieldHdr = new JTextField();\r
-            jTextFieldHdr.setBounds(new java.awt.Rectangle(218,75,305,21));\r
-            jTextFieldHdr.setPreferredSize(new java.awt.Dimension(260,20));\r
+            jTextFieldHdr.setPreferredSize(new java.awt.Dimension(shortWidth,20));\r
+            jTextFieldHdr.setLocation(new java.awt.Point(longValueCol,rowThree));\r
+            jTextFieldHdr.setSize(new java.awt.Dimension(shortWidth,20));\r
         }\r
         return jTextFieldHdr;\r
     }\r
@@ -715,7 +685,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private JButton getJButtonBrowse() {\r
         if (jButtonBrowse == null) {\r
             jButtonBrowse = new JButton();\r
-            jButtonBrowse.setBounds(new java.awt.Rectangle(527,75,90,20));\r
+            jButtonBrowse.setBounds(new java.awt.Rectangle(longValueCol + shortWidth + 7,rowThree,90,20));\r
             jButtonBrowse.setText("Browse");\r
             jButtonBrowse.setPreferredSize(new java.awt.Dimension(99,20));\r
             jButtonBrowse.addActionListener(new AbstractAction() {\r
@@ -766,59 +736,50 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     public void componentResized(ComponentEvent arg0) {\r
         int intPreferredWidth = 500;\r
         \r
-        Tools.resizeComponentWidth(this.jTextFieldClass, this.getWidth(), intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
-        Tools.resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth-10);\r
-        \r
-    }\r
-    /**\r
-     * This method initializes jTextFieldHelp  \r
-     *         \r
-     * @return javax.swing.JTextField  \r
-     */\r
-    private JTextField getJTextFieldHelp() {\r
-        if (jTextFieldHelp == null) {\r
-            jTextFieldHelp = new JTextField();\r
-            jTextFieldHelp.setBounds(new java.awt.Rectangle(122,33,390,20));\r
-            jTextFieldHelp.setPreferredSize(new java.awt.Dimension(260,20));\r
-        }\r
-        return jTextFieldHelp;\r
+        Tools.resizeComponentWidth(this.jTextFieldAddClass, this.getWidth(), intPreferredWidth-28);\r
+        Tools.resizeComponentWidth(this.jHelpTextScrollPane, this.getWidth(), intPreferredWidth-28);\r
+        Tools.resizeComponentWidth(this.jScrollPaneTable, this.getWidth(), intPreferredWidth-10);\r
+        Tools.resizeComponentWidth(this.jTextFieldHdr, this.getWidth(), intPreferredWidth - 7);\r
+        Tools.relocateComponentX(this.jButtonBrowse, this.getWidth(), intPreferredWidth,\r
+                                  DataType.SPACE_TO_RIGHT_FOR_GENERATE_BUTTON); \r
     }\r
 \r
     /**\r
-     * This method initializes jTextField1RecInstName  \r
-     *         \r
-     * @return javax.swing.JTextField  \r
+     * This method initializes jHelpTextScrollPane\r
+     *\r
+     * @return javax.swing.JScrollPane jHelpTextScrollPane\r
      */\r
-    private JTextField getJTextField1RecInstName() {\r
-        if (jTextField1RecInstName == null) {\r
-            jTextField1RecInstName = new JTextField();\r
-            jTextField1RecInstName.setBounds(new java.awt.Rectangle(218,110,291,20));\r
-            jTextField1RecInstName.setEnabled(true);\r
-            jTextField1RecInstName.setVisible(false);\r
-        }\r
-        return jTextField1RecInstName;\r
+    private JScrollPane getJHelpTextScrollPane() {\r
+        if (jHelpTextScrollPane == null) {\r
+            jHelpTextScrollPane = new JScrollPane();\r
+            jHelpTextScrollPane.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
+            jHelpTextScrollPane.setPreferredSize(new java.awt.Dimension(longValueWidth, 80));\r
+            jHelpTextScrollPane.setSize(new java.awt.Dimension(longValueWidth, 80));\r
+            jHelpTextScrollPane.setLocation(new java.awt.Point(shortValueCol,rowTwo));\r
+            jHelpTextScrollPane.setViewportView(getJTextAreaHelp());\r
+        }\r
+        return jHelpTextScrollPane;\r
     }\r
 \r
     /**\r
-     * This method initializes jTextField2RecInstVer   \r
+     * This method initializes jTextAreaHelp   \r
      *         \r
-     * @return javax.swing.JTextField  \r
+     * @return javax.swing.JTextArea   \r
      */\r
-    private JTextField getJTextField2RecInstVer() {\r
-        if (jTextField2RecInstVer == null) {\r
-            jTextField2RecInstVer = new JTextField();\r
-            jTextField2RecInstVer.setBounds(new java.awt.Rectangle(218,135,292,20));\r
-            jTextField2RecInstVer.setEnabled(true);\r
+    private JTextArea getJTextAreaHelp() {\r
+        if (jTextAreaHelp == null) {\r
+            jTextAreaHelp = new JTextArea();\r
+            jTextAreaHelp.setLineWrap(true);\r
+            jTextAreaHelp.setWrapStyleWord(true);\r
         }\r
-        return jTextField2RecInstVer;\r
+        return jTextAreaHelp;\r
     }\r
 \r
     private JScrollPane getJScrollPaneModules() {\r
         if (jScrollPaneModules == null) {\r
             jScrollPaneModules = new JScrollPane();\r
-            jScrollPaneModules.setBounds(new java.awt.Rectangle(218,245,293,73));\r
-            jScrollPaneModules.setPreferredSize(new java.awt.Dimension(320, 80));\r
+            jScrollPaneModules.setBounds(new java.awt.Rectangle(longValueCol,rowFive,medWidth,60));\r
+            jScrollPaneModules.setPreferredSize(new java.awt.Dimension(medWidth, 60));\r
             jScrollPaneModules.setViewportView(getICheckBoxListSupportedModules());\r
         }\r
         return jScrollPaneModules;\r
@@ -827,7 +788,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private ICheckBoxList getICheckBoxListSupportedModules() {\r
         if (iCheckBoxListModules == null) {\r
             iCheckBoxListModules = new ICheckBoxList();\r
-            iCheckBoxListModules.setBounds(new java.awt.Rectangle(218,246,292,73));\r
+            iCheckBoxListModules.setBounds(new java.awt.Rectangle(longValueCol,rowFour,medWidth,60));\r
             Vector<String> v = new Vector<String>();\r
             v.add("BASE");\r
             v.add("SEC");\r
@@ -858,8 +819,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private JScrollPane getJScrollPane1Arch() {\r
         if (jScrollPane1Arch == null) {\r
             jScrollPane1Arch = new JScrollPane();\r
-            jScrollPane1Arch.setBounds(new java.awt.Rectangle(218,170,293,73));\r
-            jScrollPane1Arch.setPreferredSize(new java.awt.Dimension(320, 80));\r
+            jScrollPane1Arch.setBounds(new java.awt.Rectangle(longValueCol,rowFour,medWidth,60));\r
+            jScrollPane1Arch.setPreferredSize(new java.awt.Dimension(medWidth, 60));\r
             jScrollPane1Arch.setViewportView(getICheckBoxListArch());\r
         }\r
         return jScrollPane1Arch;\r
@@ -872,7 +833,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     private ICheckBoxList getICheckBoxListArch() {\r
         if (iCheckBoxListArch == null) {\r
             iCheckBoxListArch = new ICheckBoxList();\r
-            iCheckBoxListArch.setBounds(new java.awt.Rectangle(218,171,292,66));\r
+            iCheckBoxListArch.setBounds(new java.awt.Rectangle(longValueCol,rowFour,medWidth,60));\r
             Vector<String> v = new Vector<String>();\r
             v.add("IA32");\r
             v.add("X64");\r
@@ -885,36 +846,6 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         return iCheckBoxListArch;\r
     }\r
 \r
-    /**\r
-     * This method initializes jComboBox       \r
-     *         \r
-     * @return javax.swing.JComboBox   \r
-     */\r
-    private JComboBox getJComboBox() {\r
-        if (jComboBox == null) {\r
-            jComboBox = new JComboBox();\r
-            jComboBox.setPreferredSize(new java.awt.Dimension(31,20));\r
-            jComboBox.setSize(new java.awt.Dimension(290,20));\r
-            jComboBox.setLocation(new java.awt.Point(218,111));\r
-            jComboBox.addFocusListener(new java.awt.event.FocusAdapter() {\r
-                public void focusGained(java.awt.event.FocusEvent e) {\r
-                    if (jTextFieldClass.getText().length() == 0) {\r
-                        return;\r
-                    }\r
-                    jComboBox.removeAllItems();\r
-                    getLibInstances(jTextFieldClass.getText());\r
-                    Set<String> libNames = libNameGuidMap.keySet();\r
-                    Iterator<String> si = libNames.iterator();\r
-                    while(si.hasNext()) {\r
-                        jComboBox.addItem(si.next());\r
-                    }\r
-                }\r
-            });\r
-         \r
-        }\r
-        return jComboBox;\r
-    }\r
-\r
     private void getLibInstances(String libClass){\r
         libNameGuidMap.clear();\r
         try {\r