From e4fa0b8e4149c36fb669ffe814c3bed587817b0a Mon Sep 17 00:00:00 2001 From: Serge Rider Date: Sat, 26 Nov 2016 13:58:59 +0300 Subject: [PATCH] UI fixes. Security deps. Former-commit-id: da030f7fb426993faf5c9afbf6fa815181235681 --- .../org.jkiss.dbeaver.core/META-INF/MANIFEST.MF | 1 + .../ui/css/EditorFolderElementHandler.java | 16 ++++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF index 6f408d8dd4..6351c28cdb 100644 --- a/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF +++ b/plugins/org.jkiss.dbeaver.core/META-INF/MANIFEST.MF @@ -109,6 +109,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.core.filesystem, org.eclipse.core.resources, org.eclipse.core.expressions, + org.eclipse.equinox.security, org.eclipse.ui, org.eclipse.ui.editors, org.eclipse.ui.views, diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/css/EditorFolderElementHandler.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/css/EditorFolderElementHandler.java index 5f11a96c3f..9892b3d8f2 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/css/EditorFolderElementHandler.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/css/EditorFolderElementHandler.java @@ -30,12 +30,16 @@ public class EditorFolderElementHandler extends CSSPropertySelectedTabsSWTHandle //Object cssId = control.getData(CSSSWTConstants.CSS_ID_KEY); if (PROP_BACKGROUND.equalsIgnoreCase(property) && (value.getCssValueType() == CSSValue.CSS_VALUE_LIST)) { Color newColor = null; - IEditorPart activeEditor = DBeaverUI.getActiveWorkbenchWindow().getActivePage().getActiveEditor(); - if (activeEditor instanceof DBPContextProvider) { - DBCExecutionContext context = ((DBPContextProvider) activeEditor).getExecutionContext(); - if (context != null) { - newColor = UIUtils.getConnectionColor(context.getDataSource().getContainer().getConnectionConfiguration()); - } + try { + IEditorPart activeEditor = DBeaverUI.getActiveWorkbenchWindow().getActivePage().getActiveEditor(); + if (activeEditor instanceof DBPContextProvider) { + DBCExecutionContext context = ((DBPContextProvider) activeEditor).getExecutionContext(); + if (context != null) { + newColor = UIUtils.getConnectionColor(context.getDataSource().getContainer().getConnectionConfiguration()); + } + } + } catch (Exception e) { + // Some UI issues. Probably workbench window or page wasn't yet created } if (newColor == null) { super.applyCSSProperty(control, property, value, pseudo, engine); -- GitLab