if (instanceVer != null){\r
lc.setRecommendedInstanceVersion(instanceVer);\r
} else {\r
- lc.unsetRecommendedInstanceVersion();\r
+ if (lc.isSetRecommendedInstanceVersion()) {\r
+ lc.unsetRecommendedInstanceVersion();\r
+ }\r
}\r
} else {\r
- lc.unsetRecommendedInstanceGuid();\r
- lc.unsetRecommendedInstanceVersion();\r
+ if (lc.isSetRecommendedInstanceGuid()) {\r
+ lc.unsetRecommendedInstanceGuid();\r
+ }\r
}\r
\r
if (stringToList(hdrAttribArch) != null){\r
lc.setSupArchList(stringToList(hdrAttribArch));\r
} else {\r
- lc.unsetSupArchList();\r
+ if (lc.isSetSupArchList()) {\r
+ lc.unsetSupArchList();\r
+ }\r
}\r
if (stringToList(hdrAttribModType) != null){\r
lc.setSupModuleList(stringToList(hdrAttribModType));\r
} else {\r
- lc.unsetSupModuleList();\r
+ if (lc.isSetSupModuleList()) {\r
+ lc.unsetSupModuleList();\r
+ }\r
}\r
}\r
\r
e.setGuidValue(guid);\r
e.setHelpText(hlp);\r
if (stringToList(guidTypeList) != null) {\r
- e.setGuidTypeList(stringToList(guidTypeList));\r
+ e.setGuidTypeList(stringToList(guidTypeList));\r
}\r
else{\r
+ if (e.isSetGuidTypeList()) {\r
e.unsetGuidTypeList();\r
+ }\r
}\r
if (stringToList(archList) != null){\r
e.setSupArchList(stringToList(archList));\r
}\r
else{\r
+ if (e.isSetSupArchList()) {\r
e.unsetSupArchList();\r
+ }\r
}\r
if (stringToList(modTypeList) != null) {\r
e.setSupModuleList(stringToList(modTypeList));\r
}\r
else{\r
+ if (e.isSetSupModuleList()) {\r
e.unsetSupModuleList();\r
+ }\r
}\r
\r
}\r
e.setSupArchList(stringToList(archList));\r
}\r
else{\r
+ if (e.isSetSupArchList()) {\r
e.unsetSupArchList();\r
+ }\r
}\r
if (stringToList(modTypeList) != null) {\r
e.setSupModuleList(stringToList(modTypeList));\r
}\r
else{\r
+ if (e.isSetSupModuleList()) {\r
e.unsetSupModuleList();\r
+ }\r
}\r
}\r
cursor.dispose();\r
e.setSupArchList(stringToList(archList));\r
}\r
else{\r
+ if (e.isSetSupArchList()) {\r
e.unsetSupArchList();\r
+ }\r
}\r
if (stringToList(modTypeList) != null) {\r
e.setSupModuleList(stringToList(modTypeList));\r
}\r
else{\r
+ if (e.isSetSupModuleList()) {\r
e.unsetSupModuleList();\r
+ }\r
}\r
}\r
cursor.dispose();\r
*/\r
if (hdrAttribArch != null) {\r
lc.setSupArchList(stringToList(hdrAttribArch));\r
+ } else {\r
+ if (lc.isSetSupArchList()) {\r
+ lc.unsetSupArchList();\r
+ }\r
}\r
+\r
if (hdrAttribModType != null) {\r
lc.setSupModuleList(stringToList(hdrAttribModType));\r
} else {\r
- lc.unsetSupModuleList();\r
+ if (lc.isSetSupModuleList()) {\r
+ lc.unsetSupModuleList();\r
+ }\r
}\r
\r
}\r
if (archList != null){\r
pe.setSupArchList(stringToList(archList));\r
} else {\r
- pe.unsetSupArchList();\r
+ if (pe.isSetSupArchList()) {\r
+ pe.unsetSupArchList();\r
+ }\r
}\r
if (modTypeList != null){\r
pe.setSupModuleList(stringToList(modTypeList));\r
} else {\r
- pe.unsetSupModuleList();\r
+ if (pe.isSetSupModuleList()) {\r
+ pe.unsetSupModuleList();\r
+ }\r
}\r
}\r
\r
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
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
\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
//\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