From 635991473a557ff3ff161938704261487349dc3c Mon Sep 17 00:00:00 2001 From: Katja Luther Date: Tue, 26 Nov 2013 09:03:22 +0000 Subject: [PATCH] #3897 --- eu.etaxonomy.taxeditor.store/plugin.xml | 2 +- .../view/datasource/handler/UpdateDataSourceHandler.java | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml index 0f385a5af..4b7d01cb2 100644 --- a/eu.etaxonomy.taxeditor.store/plugin.xml +++ b/eu.etaxonomy.taxeditor.store/plugin.xml @@ -358,7 +358,7 @@ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java index 80ff1d3b8..db4c250dc 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java @@ -15,7 +15,9 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; +import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.handlers.HandlerUtil; import org.eclipse.ui.progress.IProgressConstants; import eu.etaxonomy.cdm.database.update.CdmUpdater; @@ -43,13 +45,16 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler { final CdmMetaDataAwareDataSourceContainer container = getSelectedDataSourceContainer(event); final Display display = Display.getCurrent(); - + if(! MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Confirm Deletion", "Are you sure you want to update the datasource?")){ + return false; + } Job job = new Job("Updating datasource " + container.getDataSource().getName()){ @Override protected IStatus run(IProgressMonitor monitor) { CdmUpdater updater = new CdmUpdater(); IStatus status = null; + try{ if(updater.updateToCurrentVersion(container.getDataSource(), CdmProgressMonitorAdapter.CreateMonitor(monitor))){ display.asyncExec(new Runnable(){ -- 2.34.1