From 9a57995bd50692f7db1fa61754fa4ad51ba6a9e1 Mon Sep 17 00:00:00 2001 From: jurgen Date: Mon, 14 Sep 2015 22:29:44 +0000 Subject: [PATCH] Maven artifact update --- .../ui/dialogs/driver/DriverDownloadDialog.java | 1 + .../ui/dialogs/driver/DriverDownloadManualPage.java | 11 +++-------- .../ui/dialogs/driver/DriverDownloadWizard.java | 2 +- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadDialog.java index 1305d5570f..a6bdb167c7 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadDialog.java @@ -45,6 +45,7 @@ public class DriverDownloadDialog extends WizardDialog DriverDownloadDialog(Shell shell, DriverDescriptor driver, List files, boolean forceDownload) { super(shell, new DriverDownloadWizard(driver, files, forceDownload)); + getWizard().init(DBeaverUI.getActiveWorkbenchWindow().getWorkbench(), null); } DriverDescriptor getDriver() { diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java index 1cd5c16442..42780cacaa 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadManualPage.java @@ -47,16 +47,11 @@ class DriverDownloadManualPage extends DriverDownloadPage { Composite composite = UIUtils.createPlaceholder(parent, 1); composite.setLayoutData(new GridData(GridData.FILL_BOTH)); - StringBuilder message = new StringBuilder(); - message.append("").append(driver.getFullName()); - message.append(" driver files missing.\n\n" + - "According to vendor policy this driver isn't publicly available and you have to download it manually from vendor's web site.\n\n" + - "After successful driver download you will need to add JAR files in DBeaver libraries list."); - Text infoText = new Text(composite, SWT.MULTI | SWT.READ_ONLY | SWT.WRAP); - infoText.setText(message.toString()); + infoText.setText(driver.getFullName() + " driver files missing.\n\n" + + "According to vendor policy this driver isn't publicly available\nand you have to download it manually from vendor's web site.\n\n" + + "After successful driver download you will need to add JAR files in DBeaver libraries list."); GridData gd = new GridData(GridData.FILL_HORIZONTAL); - gd.widthHint = 200; infoText.setLayoutData(gd); Group filesGroup = UIUtils.createControlGroup(composite, "Driver files", 1, -1, -1); diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java index 3269f52544..2dec807413 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverDownloadWizard.java @@ -80,7 +80,7 @@ public class DriverDownloadWizard extends Wizard implements IExportWizard { @Override public void init(IWorkbench workbench, IStructuredSelection currentSelection) { setWindowTitle("Driver settings"); - setNeedsProgressMonitor(true); + setNeedsProgressMonitor(hasPredefinedFiles()); setHelpAvailable(true); } -- GitLab