merge-update from trunk

diff --git a/eu.etaxonomy.taxeditor.store/plugin.xml b/eu.etaxonomy.taxeditor.store/plugin.xml
index 50e6f7cce68a943693e0437db8170c274a0e6b4b..c4c5996798a81b862b3d14a4b62bbfcf94aff573 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/plugin.xml
+++ b/eu.etaxonomy.taxeditor.store/plugin.xml
@@ -364,7 +364,7 @@
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.store.datasource.update"
-               label="Update"
+               label="Update Datamodel"
                style="push">
             <visibleWhen
                   checkEnabled="true">

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 80ff1d3b833197f9a90280dd6f28c713ace53193..db4c250dc3ce0067c6fb6091ff9d1454ee7d9617 100644 (file)
--- 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(){