From 220040c3ecd96a64ef995577974de541e5c63110 Mon Sep 17 00:00:00 2001
From: serge-rider <serge@jkiss.org>
Date: Sun, 9 Jun 2019 22:50:44 +0300
Subject: [PATCH] Color settings dialogs fix (NPEs)

Former-commit-id: 06c447644ae38f6299b37bd7a7c2d487a214fc10
---
 .../dbeaver/ui/controls/resultset/ColorSettingsDialog.java  | 2 +-
 .../ui/controls/resultset/EditVirtualEntityDialog.java      | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ColorSettingsDialog.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ColorSettingsDialog.java
index a8b4e814ec..291184a870 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ColorSettingsDialog.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/ColorSettingsDialog.java
@@ -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()));
diff --git a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/EditVirtualEntityDialog.java b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/EditVirtualEntityDialog.java
index 606e5cc4da..0e60f934bd 100644
--- a/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/EditVirtualEntityDialog.java
+++ b/plugins/org.jkiss.dbeaver.ui.editors.data/src/org/jkiss/dbeaver/ui/controls/resultset/EditVirtualEntityDialog.java
@@ -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);
-- 
GitLab