提交 5e19487f 编写于 作者: J jurgen

Maven artifact resolve fixed

Former-commit-id: 23d1f934
上级 3489796f
......@@ -331,7 +331,7 @@ dialog_edit_driver_button_add_folder=Add Fol&der
dialog_edit_driver_button_add_artifact=Add &Artifact
dialog_edit_driver_button_bind_class=Find Class
dialog_edit_driver_button_classpath=&Classpath
dialog_edit_driver_button_update_version=Update Version
dialog_edit_driver_button_update_version=Download/Update
dialog_edit_driver_button_delete=D&elete
dialog_edit_driver_button_down=Do&wn
dialog_edit_driver_button_reset_to_defaults=Reset to Defaults
......
......@@ -124,7 +124,7 @@ public class DBeaverPreferencesInitializer extends AbstractPreferenceInitializer
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_AUTO_UPDATE_CHECK, true);
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_KEEP_DATABASE_EDITORS, true);
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_HOST, "");
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_PORT, 0);
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_PORT, 1080);
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_USER, "");
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_PROXY_PASSWORD, "");
PrefUtils.setDefaultPreferenceValue(store, DBeaverPreferences.UI_DRIVERS_HOME, "");
......
......@@ -938,6 +938,11 @@ public class DriverDescriptor extends AbstractDescriptor implements DBPDriver
}
}
@Override
public void updateFiles(DBRRunnableContext runnableContext) {
}
public boolean acceptDriverLicenses(DBRRunnableContext runnableContext)
{
// User must accept all licenses before actual drivers download
......
......@@ -63,6 +63,9 @@ public class MavenRegistry
}
public void loadCustomRepositories() {
// Clear not-found cache
notFoundArtifacts.clear();
// Remove all custom repositories
for (Iterator<MavenRepository> iterator = repositories.iterator(); iterator.hasNext(); ) {
MavenRepository repository = iterator.next();
......
......@@ -440,6 +440,8 @@ 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);
}
......@@ -590,6 +592,7 @@ public class DriverEditDialog extends HelpEnabledDialog
{
libTable.refresh();
findClassButton.setEnabled(provider.isDriversManagable() && !libList.isEmpty());
updateVersionButton.setEnabled(!libList.isEmpty());
}
private void changeLibSelection()
......@@ -598,7 +601,6 @@ public class DriverEditDialog extends HelpEnabledDialog
deleteButton.setEnabled(selectedLib != null);
upButton.setEnabled(libList.indexOf(selectedLib) > 0);
downButton.setEnabled(libList.indexOf(selectedLib) < libList.size() - 1);
updateVersionButton.setEnabled(selectedLib != null && selectedLib.isMavenArtifact());
}
private void onChangeProperty()
......
......@@ -97,6 +97,8 @@ public interface DBPDriver extends DBPObject
void validateFilesPresence(DBRRunnableContext runnableContext);
void updateFiles(DBRRunnableContext runnableContext);
void loadDriver(DBRRunnableContext runnableContext) throws DBException;
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册