提交 6d169c74 编写于 作者: S Serge Rider

New connection: use selected folder as default location

上级 9034b9bd
......@@ -92,6 +92,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
private List<String> bootstrapQueries;
private boolean ignoreBootstrapErrors;
private Text descriptionText;
private DBPDataSourceFolder dataSourceFolder;
private static class FilterInfo {
final Class<?> type;
......@@ -542,6 +543,7 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
if (!dataSource.isSavePassword()) {
dataSource.resetPassword();
}
dataSource.setFolder(dataSourceFolder);
final DBPConnectionConfiguration confConfig = dataSource.getConnectionConfiguration();
......@@ -585,6 +587,10 @@ class ConnectionPageGeneral extends ActiveWizardPage<ConnectionWizard> {
}
}
public void setDataSourceFolder(DBPDataSourceFolder dataSourceFolder) {
this.dataSourceFolder = dataSourceFolder;
}
private class SchemaReadJob extends AbstractJob {
private DBSObjectContainer objectContainer;
public SchemaReadJob(DBSObjectContainer objectContainer) {
......
......@@ -24,6 +24,7 @@ import org.jkiss.code.Nullable;
import org.jkiss.dbeaver.core.CoreMessages;
import org.jkiss.dbeaver.core.DBeaverCore;
import org.jkiss.dbeaver.model.app.DBPDataSourceRegistry;
import org.jkiss.dbeaver.model.navigator.DBNLocalFolder;
import org.jkiss.dbeaver.registry.DataSourceDescriptor;
import org.jkiss.dbeaver.registry.DataSourceProviderDescriptor;
import org.jkiss.dbeaver.registry.DataSourceProviderRegistry;
......@@ -42,6 +43,7 @@ import java.util.Map;
public class NewConnectionWizard extends ConnectionWizard
{
private IStructuredSelection selection;
private List<DataSourceProviderDescriptor> availableProvides = new ArrayList<>();
private ConnectionPageDriver pageDrivers;
private Map<DataSourceProviderDescriptor, ConnectionPageSettings> settingsPages = new HashMap<>();
......@@ -116,6 +118,14 @@ public class NewConnectionWizard extends ConnectionWizard
pageNetwork = new ConnectionPageNetwork(this);
addPage(pageGeneral);
addPage(pageNetwork);
// Initial settings
if (selection != null && !selection.isEmpty()) {
final Object element = selection.getFirstElement();
if (element instanceof DBNLocalFolder) {
pageGeneral.setDataSourceFolder(((DBNLocalFolder) element).getFolder());
}
}
}
@Nullable
......@@ -162,6 +172,7 @@ public class NewConnectionWizard extends ConnectionWizard
@Override
public void init(IWorkbench workbench, IStructuredSelection selection)
{
this.selection = selection;
}
@Override
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册