提交 220040c3 编写于 作者: S serge-rider

Color settings dialogs fix (NPEs)


Former-commit-id: 06c44764
上级 16f9a0ff
......@@ -280,7 +280,7 @@ class ColorSettingsDialog extends BaseDialog {
}
if (curOverride.isRange()) {
if (valueEditor2 != null) {
valueEditor2.primeEditorValue(values.length < 2 ? null : values[1]);
valueEditor2.primeEditorValue(ArrayUtils.isEmpty(values) || values.length < 2 ? null : values[1]);
}
if (!CommonUtils.isEmpty(curOverride.getColorBackground2())) {
bgColorSelector2.setColorValue(StringConverter.asRGB(curOverride.getColorBackground2()));
......
......@@ -260,8 +260,10 @@ class EditVirtualEntityDialog extends BaseDialog {
if (!coList.isEmpty()) {
java.util.List<String> coStrings = new ArrayList<>();
for (DBVColorOverride co : coList) {
for (Object value : co.getAttributeValues()) {
coStrings.add(CommonUtils.toString(value));
if (co.getAttributeValues() != null) {
for (Object value : co.getAttributeValues()) {
coStrings.add(CommonUtils.toString(value));
}
}
}
colorSettings = String.join(",", coStrings);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册