From 20d48e61d8ca665f8b3a12c1b428f2d68ce97aec Mon Sep 17 00:00:00 2001
From: jurgen <serge-rider@users.noreply.github.com>
Date: Mon, 1 Jun 2015 07:56:09 +0000
Subject: [PATCH] Editor background color fix (connection color)

Former-commit-id: d8fc0f2aa8d28c7bb6903835374bbb9186695308
---
 .../ui/editors/DatabaseEditorUtils.java       | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
index 42f0953f16..06e003e8d2 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/DatabaseEditorUtils.java
@@ -18,10 +18,13 @@
 package org.jkiss.dbeaver.ui.editors;
 
 import org.eclipse.swt.custom.CTabFolder;
+import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.ui.IEditorPart;
 import org.jkiss.dbeaver.model.DBPContextProvider;
+import org.jkiss.dbeaver.model.IDataSourceContainerProvider;
 import org.jkiss.dbeaver.model.exec.DBCExecutionContext;
+import org.jkiss.dbeaver.model.struct.DBSDataSourceContainer;
 
 /**
  * DB editor utils
@@ -42,16 +45,21 @@ public class DatabaseEditorUtils {
             return;
         }
 
-        DBCExecutionContext context = null;
-        if (editor instanceof DBPContextProvider) {
-            context = ((DBPContextProvider) editor).getExecutionContext();
+        Color bgColor = null;
+        if (editor instanceof IDataSourceContainerProvider) {
+            DBSDataSourceContainer container = ((IDataSourceContainerProvider) editor).getDataSourceContainer();
+            if (container != null) {
+                bgColor = container.getConnectionInfo().getColor();
+            }
+        } else if (editor instanceof DBPContextProvider) {
+            DBCExecutionContext context = ((DBPContextProvider) editor).getExecutionContext();
+            bgColor = context.getDataSource().getContainer().getConnectionInfo().getColor();
         }
-        if (context == null) {
+        if (bgColor == null) {
             rootComposite.setBackground(null);
-            return;
+        } else {
+            rootComposite.setBackground(bgColor);
         }
-        rootComposite.setBackground(
-            context.getDataSource().getContainer().getConnectionInfo().getColor());
     }
 
 }
-- 
GitLab