Added some checks to see if the attributes were set - clears up some warning messages...

[mirror_edk2.git] / Tools / Source / FrameworkWizard / src / org / tianocore / frameworkwizard / packaging / ui / SpdLibClassDecls.java

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 4d35348dcf0e11da298c7687accf9a9b7238631f..dade30d282d77959bdcbca787e480bf1477c17bf 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
@@ -251,7 +251,6 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            vModule.add("UEFI_DRIVER");\r
            vModule.add("UEFI_APPLICATION");\r
            vModule.add("USER_DEFINED");\r
-           vModule.add("NONE");\r
 \r
            jTable.getColumnModel().getColumn(cnSupMod).setCellEditor(new ListEditor(vModule));\r
           \r
@@ -293,12 +292,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
                arch = m.getValueAt(row, cnSupArch).toString();\r
             }\r
             String module = null;\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
@@ -308,7 +303,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             \r
 // LAH            getLibInstances(lib);\r
 \r
-// LAH            String guid = nameToGuid(name);\r
+            if (name != null) {\r
+              String guid = nameToGuid(name);\r
+            }\r
             \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
@@ -589,8 +586,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             //\r
             //convert to GUID before storing recommended lib instance.\r
             //\r
-            getLibInstances(row[0]);\r
-\r
+            getLibInstances(row[cnClassName]);\r
 // 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