Replaced set*(null) with unset*() to clear empty attributes that were causing invalid...

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

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
index ca3a4dc710ccc08903279a45f6f35b213760cdc7..2aaf6e22f7f047411804dcdf344dae1725db1564 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
@@ -336,16 +336,26 @@ public class SpdFileContents {
             lc.setIncludeHeader(hdr);\r
             lc.setHelpText(hlp);\r
             if (clsUsage != null) {\r
-                lc.setRecommendedInstanceGuid(clsUsage);\r
-            }\r
-            if (instanceVer != null){\r
+              lc.setRecommendedInstanceGuid(clsUsage);\r
+              if (instanceVer != null){\r
                 lc.setRecommendedInstanceVersion(instanceVer);\r
+              } else {\r
+                lc.unsetRecommendedInstanceVersion();\r
+              }\r
+            } else {\r
+              lc.unsetRecommendedInstanceGuid();\r
+              lc.unsetRecommendedInstanceVersion();\r
             }\r
+\r
             if (stringToList(hdrAttribArch) != null){\r
-                lc.setSupArchList(stringToList(hdrAttribArch));\r
+              lc.setSupArchList(stringToList(hdrAttribArch));\r
+            } else {\r
+              lc.unsetSupArchList();\r
             }\r
             if (stringToList(hdrAttribModType) != null){\r
-                lc.setSupModuleList(stringToList(hdrAttribModType));\r
+              lc.setSupModuleList(stringToList(hdrAttribModType));\r
+            } else {\r
+              lc.unsetSupModuleList();\r
             }\r
         }\r
         \r
@@ -390,19 +400,19 @@ public class SpdFileContents {
                 e.setGuidTypeList(stringToList(guidTypeList));\r
             }\r
             else{\r
-                e.setGuidTypeList(null);\r
+                e.unsetGuidTypeList();\r
             }\r
             if (stringToList(archList) != null){\r
                 e.setSupArchList(stringToList(archList));\r
             }\r
             else{\r
-                e.setSupArchList(null);\r
+                e.unsetSupArchList();\r
             }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
             else{\r
-                e.setSupModuleList(null);\r
+                e.unsetSupModuleList();\r
             }\r
             \r
         }\r
@@ -430,13 +440,13 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));\r
             }\r
             else{\r
-                e.setSupArchList(null);\r
+                e.unsetSupArchList();\r
             }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
             else{\r
-                e.setSupModuleList(null);\r
+                e.unsetSupModuleList();\r
             }\r
         }\r
         cursor.dispose();\r
@@ -463,13 +473,13 @@ public class SpdFileContents {
                 e.setSupArchList(stringToList(archList));\r
             }\r
             else{\r
-                e.setSupArchList(null);\r
+                e.unsetSupArchList();\r
             }\r
             if (stringToList(modTypeList) != null) {\r
                 e.setSupModuleList(stringToList(modTypeList));\r
             }\r
             else{\r
-                e.setSupModuleList(null);\r
+                e.unsetSupModuleList();\r
             }\r
         }\r
         cursor.dispose();\r
@@ -580,12 +590,14 @@ public class SpdFileContents {
                 libClass[i][1] = lc.getIncludeHeader();\r
                 libClass[i][2] = lc.getHelpText();\r
 // LAH added logic so you cannot set the version unless the GUID is defined.\r
+/* LAH do not set now\r
                 if (lc.getRecommendedInstanceGuid() != null) {\r
                   libClass[i][3] = lc.getRecommendedInstanceGuid();\r
                   if (lc.getRecommendedInstanceVersion() != null) {\r
                     libClass[i][4] = lc.getRecommendedInstanceVersion();\r
                   }\r
                 }\r
+*/\r
                 if (lc.getSupArchList() != null) {\r
                     libClass[i][5] = listToString(lc.getSupArchList());\r
                 }\r
@@ -967,17 +979,21 @@ public class SpdFileContents {
         lc.setIncludeHeader(clsIncludeFile);\r
         lc.setHelpText(help);\r
 // LAH added logic so you cannot set the version unless the GUID is defined.\r
+/* LAH\r
         if (clsUsage != null) {\r
           lc.setRecommendedInstanceGuid(clsUsage);\r
           if (instanceVer != null) {\r
             lc.setRecommendedInstanceVersion(instanceVer);\r
           }\r
         }\r
+*/\r
         if (hdrAttribArch != null) {\r
             lc.setSupArchList(stringToList(hdrAttribArch));\r
         }\r
         if (hdrAttribModType != null) {\r
-            lc.setSupModuleList(stringToList(hdrAttribModType));\r
+          lc.setSupModuleList(stringToList(hdrAttribModType));\r
+        } else {\r
+          lc.unsetSupModuleList();\r
         }\r
         \r
     }\r
@@ -1260,10 +1276,14 @@ public class SpdFileContents {
         pe.setTokenSpaceGuidCName(spaceGuid);\r
         pe.setHelpText(help);\r
         if (archList != null){\r
-            pe.setSupArchList(stringToList(archList));\r
+          pe.setSupArchList(stringToList(archList));\r
+        } else {\r
+          pe.unsetSupArchList();\r
         }\r
         if (modTypeList != null){\r
-            pe.setSupModuleList(stringToList(modTypeList));\r
+          pe.setSupModuleList(stringToList(modTypeList));\r
+        } else {\r
+          pe.unsetSupModuleList();\r
         }\r
     }\r
 \r

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index e5336c2ba9213832adc5c5b5fb1e5737c991b55b..4d35348dcf0e11da298c7687accf9a9b7238631f 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -87,11 +87,11 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private JButton jButtonRemove = null;\r
 \r
-    private JButton jButtonClearAll = null;\r
+    private JButton jButtonRemoveAll = null;\r
 \r
-    private JLabel jLabel = null;\r
+    private JLabel jLabelHdr = null;\r
 \r
-    private JTextField jTextField = null;\r
+    private JTextField jTextFieldHdr = null;\r
 \r
     private JButton jButtonBrowse = null;\r
     \r
@@ -127,15 +127,23 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private JLabel jLabel6SupModList = null;\r
     \r
-    private JScrollPane jScrollPaneArch = null;\r
+    private JScrollPane jScrollPaneModules = null;\r
     \r
-    private JScrollPane jScrollPane1 = null;\r
+    private JScrollPane jScrollPane1Arch = null;\r
     \r
-    private ICheckBoxList iCheckBoxListArch = null;\r
+    private ICheckBoxList iCheckBoxListModules = null;\r
 \r
     private ICheckBoxList iCheckBoxList = null;\r
 \r
     private JComboBox jComboBox = null;\r
+\r
+    private int cnClassName = 0;\r
+    private int cnHdrFile = 1;\r
+    private int cnHelpText = 2;\r
+    private int cnRecInstName = 3;\r
+    private int cnRecInstVer = 4;\r
+    private int cnSupArch = 5;\r
+    private int cnSupMod = 6;\r
     \r
     HashMap<String, String> libNameGuidMap = new HashMap<String, String>();\r
 \r
@@ -185,12 +193,15 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
       This method initializes jScrollPane      \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,608,253));\r
-            jScrollPane.setPreferredSize(new java.awt.Dimension(330,150));\r
+            jScrollPane.setPreferredSize(new java.awt.Dimension(390,150));\r
             jScrollPane.setViewportView(getJTable());\r
         }\r
         return jScrollPane;\r
@@ -206,14 +217,17 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            model = new DefaultTableModel();\r
            jTable = new JTable(model);\r
            jTable.setRowHeight(20);\r
-           jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
-           model.addColumn("Library Class");\r
-           model.addColumn("Include Header");\r
-           model.addColumn("HelpText");\r
-           model.addColumn("Recommended Instance");\r
-           model.addColumn("Version");\r
-           model.addColumn("Supported Arch");\r
-           model.addColumn("Supported Module");\r
+//           jTable.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
+           jTable.setColumnSelectionAllowed(false);\r
+           model.addColumn("Class Name");\r
+           model.addColumn("Header");\r
+           model.addColumn("Help Text");\r
+           model.addColumn("Reserved");\r
+           model.addColumn("Reserved");\r
+//           model.addColumn("Recommended Instance");\r
+//           model.addColumn("Version");\r
+           model.addColumn("Sup. Arch");\r
+           model.addColumn("Mod. Types");\r
            \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r
@@ -222,7 +236,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            vArch.add("EBC");\r
            vArch.add("ARM");\r
            vArch.add("PPC");\r
-           jTable.getColumnModel().getColumn(5).setCellEditor(new ListEditor(vArch));\r
+//           jTable.getColumnModel().getColumn(cnSupArch).setCellEditor(new ListEditor(vArch));\r
            \r
            Vector<String> vModule = new Vector<String>();\r
            vModule.add("BASE");\r
@@ -236,9 +250,10 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            vModule.add("DXE_SMM_DRIVER");\r
            vModule.add("UEFI_DRIVER");\r
            vModule.add("UEFI_APPLICATION");\r
-           vModule.add("TOOLS");\r
            vModule.add("USER_DEFINED");\r
-           jTable.getColumnModel().getColumn(6).setCellEditor(new ListEditor(vModule));\r
+           vModule.add("NONE");\r
+\r
+           jTable.getColumnModel().getColumn(cnSupMod).setCellEditor(new ListEditor(vModule));\r
           \r
            jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
            jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
@@ -268,18 +283,22 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         int row = arg0.getFirstRow();\r
         TableModel m = (TableModel)arg0.getSource();\r
         if (arg0.getType() == TableModelEvent.UPDATE){\r
-            String lib = m.getValueAt(row, 0) + "";\r
-            String hdr = m.getValueAt(row, 1) + "";\r
-            String hlp = m.getValueAt(row, 2) + "";\r
-            String name = m.getValueAt(row, 3) + "";\r
-            String ver = m.getValueAt(row, 4) + "";\r
+            String lib = m.getValueAt(row, cnClassName) + "";\r
+            String hdr = m.getValueAt(row, cnHdrFile) + "";\r
+            String hlp = m.getValueAt(row, cnHelpText) + "";\r
+            String name = m.getValueAt(row, cnRecInstName) + "";\r
+            String ver = m.getValueAt(row, cnRecInstVer) + "";\r
             String arch = null;\r
-            if (m.getValueAt(row, 5) != null) {\r
-               arch = m.getValueAt(row, 5).toString();\r
+            if (m.getValueAt(row, cnSupArch) != null) {\r
+               arch = m.getValueAt(row, cnSupArch).toString();\r
             }\r
             String module = null;\r
-            if (m.getValueAt(row, 6) != null) {\r
-                module = m.getValueAt(row, 6).toString();\r
+                   // if (lsm.isSelectionEmpty()) {\r
+            if (m.getValueAt(row, cnSupMod) != null) {\r
+                module = m.getValueAt(row, cnSupMod).toString();\r
+                if (module == "NONE") {\r
+                  module = null;\r
+                }\r
             }\r
             String[] rowData = {lib, hdr, hlp};\r
             if (!dataValidation(rowData)) {\r
@@ -287,10 +306,12 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             }\r
             docConsole.setSaved(false);\r
             \r
-            getLibInstances(lib);\r
-            String guid = nameToGuid(name);\r
+// LAH            getLibInstances(lib);\r
+\r
+// LAH            String guid = nameToGuid(name);\r
             \r
-            sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
+            // LAH WAS sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
+            sfc.updateSpdLibClass(row, lib, hdr, hlp, null, null, arch, module);\r
         }\r
     }\r
 \r
@@ -303,8 +324,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(80,20));\r
-            jButtonAdd.setLocation(new java.awt.Point(359,326));\r
+            jButtonAdd.setSize(new java.awt.Dimension(99,20));\r
+            jButtonAdd.setLocation(new java.awt.Point(321,326));\r
             jButtonAdd.addActionListener(this);\r
         }\r
         return jButtonAdd;\r
@@ -319,8 +340,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(80,20));\r
-            jButtonRemove.setLocation(new java.awt.Point(443,326));\r
+            jButtonRemove.setSize(new java.awt.Dimension(99,20));\r
+            jButtonRemove.setLocation(new java.awt.Point(424,326));\r
             jButtonRemove.addActionListener(this);\r
         }\r
         return jButtonRemove;\r
@@ -331,15 +352,15 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
        \r
       @return javax.swing.JButton      \r
      **/\r
-    private JButton getJButtonClearAll() {\r
-        if (jButtonClearAll == null) {\r
-            jButtonClearAll = new JButton();\r
-            jButtonClearAll.setText("Clear All");\r
-            jButtonClearAll.setSize(new java.awt.Dimension(86,20));\r
-            jButtonClearAll.setLocation(new java.awt.Point(530,326));\r
-            jButtonClearAll.addActionListener(this);\r
+    private JButton getJButtonRemoveAll() {\r
+        if (jButtonRemoveAll == null) {\r
+            jButtonRemoveAll = new JButton();\r
+            jButtonRemoveAll.setText("Remove All");\r
+            jButtonRemoveAll.setSize(new java.awt.Dimension(99,20));\r
+            jButtonRemoveAll.setLocation(new java.awt.Point(527,326));\r
+            jButtonRemoveAll.addActionListener(this);\r
         }\r
-        return jButtonClearAll;\r
+        return jButtonRemoveAll;\r
     }\r
 \r
     /**\r
@@ -406,7 +427,7 @@ 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,500));\r
+          topScrollPane.setSize(new java.awt.Dimension(634,590));\r
           topScrollPane.setViewportView(getJContentPane1());\r
         }\r
         return topScrollPane;\r
@@ -418,10 +439,32 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
      **/\r
     private JPanel getJContentPane1() {\r
         if (jContentPane == null) {\r
+            // Library Class\r
+            jStarLabel1 = new StarLabel();\r
+            jStarLabel1.setLocation(new java.awt.Point(1,7));\r
+            jLabel1ClassName = new JLabel();\r
+            jLabel1ClassName.setBounds(new java.awt.Rectangle(16,6,82,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
+            jLabel2HelpText = new JLabel();\r
+            jLabel2HelpText.setBounds(new java.awt.Rectangle(16,33,82,20));\r
+            jLabel2HelpText.setText("Help Text");\r
+\r
+            // Header File\r
+            jStarLabel2 = new StarLabel();\r
+            jStarLabel2.setLocation(new java.awt.Point(1,74));\r
+            jLabelHdr = new JLabel();\r
+            jLabelHdr.setBounds(new java.awt.Rectangle(14,74,199,22));\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.setEnabled(true);\r
+\r
             jLabel5SupArchList = new JLabel();\r
             jLabel5SupArchList.setBounds(new java.awt.Rectangle(15,169,93,16));\r
             jLabel5SupArchList.setText("Supported Arch");\r
@@ -434,26 +477,11 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jLabel3RecInstName.setBounds(new java.awt.Rectangle(17,112,195,16));\r
             jLabel3RecInstName.setEnabled(true);\r
             jLabel3RecInstName.setText("Recommended Instance Name");\r
-            jLabel2HelpText = new JLabel();\r
-            jLabel2HelpText.setBounds(new java.awt.Rectangle(16,33,82,20));\r
-            jLabel2HelpText.setText("Help Text");\r
-            starLabel = new StarLabel();\r
-            starLabel.setBounds(new java.awt.Rectangle(1,33,10,20));\r
-            jLabel1ClassName = new JLabel();\r
-            jLabel1ClassName.setBounds(new java.awt.Rectangle(16,6,82,20));\r
-            jLabel1ClassName.setText("Library Class");\r
-            jStarLabel1 = new StarLabel();\r
-            jStarLabel1.setLocation(new java.awt.Point(1,7));\r
-            jStarLabel2 = new StarLabel();\r
-            jStarLabel2.setLocation(new java.awt.Point(-1,74));\r
-            jLabel = new JLabel();\r
-            jLabel.setBounds(new java.awt.Rectangle(14,74,199,22));\r
-            jLabel.setText("Include Header for Specified Class");\r
             \r
             jContentPane = new JPanel();\r
             jContentPane.setPreferredSize(new Dimension(480, 400));\r
             jContentPane.setLayout(null);\r
-            jContentPane.add(jLabel, null);\r
+            jContentPane.add(jLabelHdr, null);\r
             jContentPane.add(jStarLabel1, null);\r
             jContentPane.add(jStarLabel2, null);\r
             jContentPane.add(getJTextFieldAdd(), null);\r
@@ -461,9 +489,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jContentPane.add(getJScrollPane(), null);\r
             jContentPane.add(getJButtonAdd(), null);\r
             jContentPane.add(getJButtonRemove(), null);\r
-            jContentPane.add(getJButtonClearAll(), null);\r
+            jContentPane.add(getJButtonRemoveAll(), null);\r
             \r
-            jContentPane.add(getJTextField(), null);\r
+            jContentPane.add(getJTextFieldHdr(), null);\r
             jContentPane.add(getJButtonBrowse(), null);\r
             jContentPane.add(jLabel1ClassName, null);\r
             jContentPane.add(starLabel, null);\r
@@ -477,8 +505,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             jContentPane.add(jLabel5SupArchList, null);\r
             jContentPane.add(jLabel6SupModList, null);\r
             \r
-            jContentPane.add(getJScrollPaneArch(), null);\r
-            jContentPane.add(getJScrollPane1(), null);\r
+            jContentPane.add(getJScrollPaneModules(), null);\r
+            jContentPane.add(getJScrollPane1Arch(), null);\r
 // LAH            jContentPane.add(getJComboBox(), null);\r
             \r
         }\r
@@ -541,16 +569,16 @@ 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[0] = jTextFieldAdd.getText();\r
-            row[1] = jTextField.getText().replace('\\', '/');\r
-            row[2] = jTextFieldHelp.getText();\r
-            row[5] = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
-            if (row[5].length() == 0){\r
-                row[5] = null;\r
+            row[cnClassName] = jTextFieldAdd.getText();\r
+            row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/');\r
+            row[cnHelpText] = jTextFieldHelp.getText();\r
+            row[cnSupArch] = vectorToString(iCheckBoxList.getAllCheckedItemsString());\r
+            if (row[cnSupArch].length() == 0) {\r
+                row[cnSupArch] = null;\r
             }\r
-            row[6] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
-            if (row[6].length() == 0){\r
-                row[6] = null;\r
+            row[cnSupMod] = vectorToString(iCheckBoxListModules.getAllCheckedItemsString());\r
+            if (row[cnSupMod].length() == 0){\r
+                row[cnSupMod] = null;\r
             }\r
             if (!dataValidation(row)) {\r
                 return;\r
@@ -566,7 +594,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 // LAH            recommendGuid = nameToGuid(row[3]);\r
 \r
 // LAH WAS             sfc.genSpdLibClassDeclarations(row[0], recommendGuid, row[1], row[2], row[5], null, null, row[4], null, row[6]);\r
-            sfc.genSpdLibClassDeclarations(row[0], null, row[1], row[2], row[5], null, null, row[4], null, row[6]);\r
+            sfc.genSpdLibClassDeclarations(row[cnClassName], null, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, row[cnRecInstVer], null, row[cnSupMod]);\r
             \r
         }\r
         //\r
@@ -583,7 +611,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             }\r
         }\r
 \r
-        if (arg0.getSource() == jButtonClearAll) {\r
+        if (arg0.getSource() == jButtonRemoveAll) {\r
             if (model.getRowCount() == 0) {\r
                 return;\r
             }\r
@@ -594,15 +622,15 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
     }\r
 \r
     private boolean dataValidation(String[] row) {\r
-        if (!DataValidation.isKeywordType(row[0])) {\r
+        if (!DataValidation.isKeywordType(row[cnClassName])) {\r
             JOptionPane.showMessageDialog(frame, "Library Class is NOT KeyWord Type.");\r
             return false;\r
         }\r
-        if (!DataValidation.isPathAndFilename(row[1])) {\r
+        if (!DataValidation.isPathAndFilename(row[cnHdrFile])) {\r
             JOptionPane.showMessageDialog(frame, "Include Header is NOT PathAndFilename Type.");\r
         }\r
-        if (row[2].length() == 0) {\r
-            JOptionPane.showMessageDialog(frame, "HelpText could NOT be empty.");\r
+        if (row[cnHelpText].length() == 0) {\r
+            JOptionPane.showMessageDialog(frame, "Help Text Must NOT be empty.");\r
         }\r
         return true;\r
     }\r
@@ -618,13 +646,13 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
        \r
       @return javax.swing.JTextField   \r
      **/\r
-    private JTextField getJTextField() {\r
-        if (jTextField == null) {\r
-            jTextField = new JTextField();\r
-            jTextField.setBounds(new java.awt.Rectangle(218,75,290,21));\r
-            jTextField.setPreferredSize(new java.awt.Dimension(260,20));\r
+    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
         }\r
-        return jTextField;\r
+        return jTextFieldHdr;\r
     }\r
 \r
     /**\r
@@ -635,9 +663,9 @@ 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(528,75,90,20));\r
+            jButtonBrowse.setBounds(new java.awt.Rectangle(527,75,90,20));\r
             jButtonBrowse.setText("Browse");\r
-            jButtonBrowse.setPreferredSize(new java.awt.Dimension(80,20));\r
+            jButtonBrowse.setPreferredSize(new java.awt.Dimension(99,20));\r
             jButtonBrowse.addActionListener(new AbstractAction() {\r
                 \r
                 /**\r
@@ -674,7 +702,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
                     \r
                     headerDest = theFile.getPath();\r
                     int fileIndex = headerDest.indexOf(System.getProperty("file.separator"), dirPrefix.length());\r
-                    jTextField.setText(headerDest.substring(fileIndex + 1).replace('\\', '/'));\r
+                    jTextFieldHdr.setText(headerDest.substring(fileIndex + 1).replace('\\', '/'));\r
                \r
                 }\r
 \r
@@ -688,7 +716,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         \r
         resizeComponentWidth(this.jTextFieldAdd, this.getWidth(), intPreferredWidth);\r
         resizeComponentWidth(this.jTextFieldHelp, this.getWidth(), intPreferredWidth);\r
-        resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth);\r
+        resizeComponentWidth(this.jScrollPane, this.getWidth(), intPreferredWidth-10);\r
         \r
     }\r
     /**\r
@@ -734,20 +762,20 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         return jTextField2RecInstVer;\r
     }\r
 \r
-    private JScrollPane getJScrollPaneArch() {\r
-        if (jScrollPaneArch == null) {\r
-            jScrollPaneArch = new JScrollPane();\r
-            jScrollPaneArch.setBounds(new java.awt.Rectangle(218,245,293,73));\r
-            jScrollPaneArch.setPreferredSize(new java.awt.Dimension(320, 80));\r
-            jScrollPaneArch.setViewportView(getICheckBoxListSupportedArchitectures());\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.setViewportView(getICheckBoxListSupportedModules());\r
         }\r
-        return jScrollPaneArch;\r
+        return jScrollPaneModules;\r
     }\r
     \r
-    private ICheckBoxList getICheckBoxListSupportedArchitectures() {\r
-        if (iCheckBoxListArch == null) {\r
-            iCheckBoxListArch = new ICheckBoxList();\r
-            iCheckBoxListArch.setBounds(new java.awt.Rectangle(218,246,292,73));\r
+    private ICheckBoxList getICheckBoxListSupportedModules() {\r
+        if (iCheckBoxListModules == null) {\r
+            iCheckBoxListModules = new ICheckBoxList();\r
+            iCheckBoxListModules.setBounds(new java.awt.Rectangle(218,246,292,73));\r
             Vector<String> v = new Vector<String>();\r
             v.add("BASE");\r
             v.add("SEC");\r
@@ -761,9 +789,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             v.add("UEFI_DRIVER");\r
             v.add("UEFI_APPLICATION");\r
             v.add("USER_DEFINED");\r
-            iCheckBoxListArch.setAllItems(v);\r
+            iCheckBoxListModules.setAllItems(v);\r
         }\r
-        return iCheckBoxListArch;\r
+        return iCheckBoxListModules;\r
     }\r
     \r
     private String vectorToString(Vector<String> v) {\r
@@ -775,14 +803,14 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         return s.trim();\r
     }\r
     \r
-    private JScrollPane getJScrollPane1() {\r
-        if (jScrollPane1 == null) {\r
-            jScrollPane1 = new JScrollPane();\r
-            jScrollPane1.setBounds(new java.awt.Rectangle(218,170,293,73));\r
-            jScrollPane1.setPreferredSize(new java.awt.Dimension(320, 80));\r
-            jScrollPane1.setViewportView(getICheckBoxList());\r
-        }\r
-        return jScrollPane1;\r
+    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.setViewportView(getICheckBoxList());\r
+        }\r
+        return jScrollPane1Arch;\r
     }\r
     /**\r
      * This method initializes iCheckBoxList   \r