From 1088a5b8197d59ba78521fa325f41120be1d57cd Mon Sep 17 00:00:00 2001 From: jurgen Date: Sat, 19 Sep 2015 12:00:16 +0000 Subject: [PATCH] Maven local repository --- .../dbeaver/registry/maven/MavenRegistry.java | 1 - .../dbeaver/registry/maven/MavenRepository.java | 4 +--- .../ui/dialogs/driver/DriverDownloadDialog.java | 14 ++++++++++---- .../ui/dialogs/driver/DriverDownloadWizard.java | 6 ++++-- .../ui/dialogs/driver/DriverEditDialog.java | 9 +-------- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java index 180d95e7c2..48609d3e20 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRegistry.java @@ -18,7 +18,6 @@ package org.jkiss.dbeaver.registry.maven; import org.eclipse.core.runtime.IConfigurationElement; -import org.eclipse.core.runtime.IExtensionRegistry; import org.eclipse.core.runtime.Platform; import org.jkiss.code.NotNull; import org.jkiss.code.Nullable; diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java index 6c5a042c0c..190cbbc0fb 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/registry/maven/MavenRepository.java @@ -84,9 +84,7 @@ public class MavenRepository if (!url.endsWith("/")) url += "/"; this.url = url; this.local = local; - if (!local) { - loadCache(); - } + loadCache(); } public void flushCache() { 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 a6bdb167c7..090cc3e8de 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 @@ -23,7 +23,6 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IWorkbenchWindow; import org.jkiss.dbeaver.core.DBeaverUI; import org.jkiss.dbeaver.registry.DriverDescriptor; import org.jkiss.dbeaver.registry.DriverFileDescriptor; @@ -42,9 +41,9 @@ public class DriverDownloadDialog extends WizardDialog private boolean doDownload = false; - DriverDownloadDialog(Shell shell, DriverDescriptor driver, List files, boolean forceDownload) + DriverDownloadDialog(Shell shell, DriverDescriptor driver, List files, boolean updateVersion, boolean forceDownload) { - super(shell, new DriverDownloadWizard(driver, files, forceDownload)); + super(shell, new DriverDownloadWizard(driver, files, updateVersion, forceDownload)); getWizard().init(DBeaverUI.getActiveWorkbenchWindow().getWorkbench(), null); } @@ -116,7 +115,14 @@ public class DriverDownloadDialog extends WizardDialog } public static boolean downloadDriverFiles(Shell shell, DriverDescriptor driver, List files, boolean forceDownload) { - DriverDownloadDialog dialog = new DriverDownloadDialog(shell, driver, files, forceDownload); + DriverDownloadDialog dialog = new DriverDownloadDialog(shell, driver, files, false, forceDownload); + dialog.setMinimumPageSize(100, 100); + dialog.open(); + return dialog.doDownload; + } + + public static boolean updateDriverFiles(Shell shell, DriverDescriptor driver, List files, boolean forceDownload) { + DriverDownloadDialog dialog = new DriverDownloadDialog(shell, driver, files, true, forceDownload); dialog.setMinimumPageSize(100, 100); dialog.open(); return dialog.doDownload; 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 2dec807413..f2e723d665 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 @@ -36,14 +36,16 @@ public class DriverDownloadWizard extends Wizard implements IExportWizard { private DriverDescriptor driver; private List files; + private boolean updateVersion; private boolean forceDownload; private DriverDownloadPage downloadPage; - public DriverDownloadWizard(@NotNull DriverDescriptor driver, List files, boolean forceDownload) { + public DriverDownloadWizard(@NotNull DriverDescriptor driver, List files, boolean updateVersion, boolean forceDownload) { this.driver = driver; this.files = files; + this.updateVersion = updateVersion; this.forceDownload = forceDownload; - setWindowTitle("Setup driver files"); + setWindowTitle(updateVersion ? "Update driver files" : "Setup driver files"); setNeedsProgressMonitor(hasPredefinedFiles()); loadSettings(); } diff --git a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java index 7339d0d34c..ad6d495e83 100644 --- a/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java +++ b/plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/dialogs/driver/DriverEditDialog.java @@ -479,10 +479,7 @@ public class DriverEditDialog extends HelpEnabledDialog updateVersionButton = UIUtils.createToolButton(libsControlGroup, CoreMessages.dialog_edit_driver_button_update_version, new SelectionAdapter() { @Override public void widgetSelected(SelectionEvent e) { -// driver.updateFiles(); -// DriverDownloadDialog.downloadDriverFiles(getShell(), driver, Collections.singletonList(lib), true); - DriverFileDescriptor selectedLib = getSelectedLibrary(); - updateArtifactVersion(selectedLib); + DriverDownloadDialog.updateDriverFiles(getShell(), driver, libList, true); } }); @@ -541,10 +538,6 @@ public class DriverEditDialog extends HelpEnabledDialog libsTab.setControl(libsGroup); } - private void updateArtifactVersion(DriverFileDescriptor lib) { - DriverDownloadDialog.downloadDriverFiles(getShell(), driver, Collections.singletonList(lib), true); - } - private void createParametersTab(TabFolder group) { Composite paramsGroup = new Composite(group, SWT.NONE); -- GitLab