From 1b0c32805da4397382c471705e8c126f9b374ad6 Mon Sep 17 00:00:00 2001
From: Serge Rider <serge@jkiss.org>
Date: Sun, 16 Apr 2017 14:18:59 +0300
Subject: [PATCH] Annotations fix

---
 .../src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java       | 2 +-
 .../src/org/jkiss/dbeaver/model/struct/DBSDataContainer.java  | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
index bda2695d5d..3c3802d7ed 100644
--- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
+++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/sql/SQLEditor.java
@@ -1888,7 +1888,7 @@ public class SQLEditor extends SQLEditorBase implements
             return getDataSourceContainer();
         }
 
-        @NotNull
+        @Nullable
         @Override
         public DBPDataSource getDataSource()
         {
diff --git a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSDataContainer.java b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSDataContainer.java
index 078856e9f4..9364bd252c 100644
--- a/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSDataContainer.java
+++ b/plugins/org.jkiss.dbeaver.model/src/org/jkiss/dbeaver/model/struct/DBSDataContainer.java
@@ -19,6 +19,7 @@ package org.jkiss.dbeaver.model.struct;
 
 import org.jkiss.code.NotNull;
 import org.jkiss.code.Nullable;
+import org.jkiss.dbeaver.model.DBPDataSource;
 import org.jkiss.dbeaver.model.data.DBDDataFilter;
 import org.jkiss.dbeaver.model.data.DBDDataReceiver;
 import org.jkiss.dbeaver.model.exec.DBCException;
@@ -41,6 +42,9 @@ public interface DBSDataContainer extends DBSObject {
     long FLAG_NONE               = 0;
     long FLAG_READ_PSEUDO        = 1 << 1;
 
+    @Nullable
+    DBPDataSource getDataSource();
+
     /**
      * Features supported by implementation
      * @return features flags
-- 
GitLab