From: Katja Luther Date: Fri, 9 Mar 2018 14:15:59 +0000 (+0100) Subject: fix test X-Git-Tag: 5.0.0^2~280 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b3a39647564364a07362136440c43f1efc08eae5 fix test --- diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingDeleteTaxonNodeOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingDeleteTaxonNodeOperation.java index 97d574274..13f60450a 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingDeleteTaxonNodeOperation.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/RemotingDeleteTaxonNodeOperation.java @@ -20,7 +20,6 @@ import eu.etaxonomy.cdm.api.application.CdmChangeEvent.Action; import eu.etaxonomy.cdm.api.service.DeleteResult; import eu.etaxonomy.cdm.api.service.UpdateResult; import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator; -import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto; import eu.etaxonomy.taxeditor.navigation.l10n.Messages; import eu.etaxonomy.taxeditor.operation.RemotingCdmUpdateOperation; @@ -65,8 +64,8 @@ public class RemotingDeleteTaxonNodeOperation extends RemotingCdmUpdateOperation if(treeNodes.size() == 1) { // when single node this is either a taxon or a classification TaxonNodeDto node = treeNodes.iterator().next(); - if(node.getType() != null && node.getType().equals(Classification.class)) { - return CdmApplicationState.getCurrentAppConfig().getClassificationService().delete(node.getUuid()); + if(node.getTaxonUuid() == null) { + return CdmApplicationState.getCurrentAppConfig().getClassificationService().delete(node.getClassificationUUID()); } return CdmApplicationState.getCurrentAppConfig().getTaxonNodeService().deleteTaxonNode((node).getUuid(), config); // } else if(node.getType().equals( Classification.class)) {