X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/d812f38a2de5cef225cad0454bc1117e48767861..83e8037496074ec16da9cfbd0c9f19fd70ab375b:/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java index 081629162..409dae7e6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/SelectFeatureTreeWizardPage.java @@ -11,6 +11,7 @@ package eu.etaxonomy.taxeditor.featuretree; import java.util.List; +import java.util.logging.ErrorManager; import org.eclipse.jface.viewers.ISelectionChangedListener; import org.eclipse.jface.viewers.IStructuredSelection; @@ -33,6 +34,8 @@ import org.eclipse.swt.widgets.Text; import eu.etaxonomy.cdm.api.service.DeleteResult; import eu.etaxonomy.cdm.api.service.IFeatureTreeService; import eu.etaxonomy.cdm.model.description.FeatureTree; +import eu.etaxonomy.taxeditor.model.DeleteResultMessagingUtils; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -149,7 +152,7 @@ public class SelectFeatureTreeWizardPage extends WizardPage implements ISelectio viewer.add(featureTree); if(CdmStore.getCurrentSessionManager().isRemoting()) { - CdmStore.getService(IFeatureTreeService.class).merge(featureTree); + CdmStore.getService(IFeatureTreeService.class).merge(featureTree, true); } else { CdmStore.getService(IFeatureTreeService.class).saveOrUpdate(featureTree); } @@ -170,7 +173,7 @@ public class SelectFeatureTreeWizardPage extends WizardPage implements ISelectio DeleteResult result = CdmStore.getService(IFeatureTreeService.class).delete(((FeatureTree) element).getUuid()); if (result.isError()){ - + DeleteResultMessagingUtils.messageDialogWithDetails(result, "The delete of the feature tree was not successful.", null); } viewer.setSelection(new StructuredSelection(new Object[0])); }