Misc fixes

Former-commit-id: 2ca8ee79

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/connection/EditConnectionWizard.java

@@ -21,6 +21,7 @@ import org.eclipse.jface.preference.PreferencePage;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.ui.IWorkbench;
 import org.eclipse.ui.IWorkbenchPropertyPage;
+import org.jkiss.code.NotNull;
 import org.jkiss.dbeaver.core.CoreMessages;
 import org.jkiss.dbeaver.model.DBPConnectionConfiguration;
 import org.jkiss.dbeaver.registry.DataSourceDescriptor;
@@ -58,6 +59,12 @@ public class EditConnectionWizard extends ConnectionWizard
         setWindowTitle(CoreMessages.dialog_connection_wizard_title);
     }
 
+    @NotNull
+    @Override
+    public DataSourceDescriptor getActiveDataSource() {
+        return dataSource;
+    }
+
     @Override
     public DriverDescriptor getSelectedDriver()
     {