Merge branch 'release/5.22.0' 5.22.0
authorjenkins <jenkins-int@bgbm.org>
Fri, 16 Apr 2021 12:15:13 +0000 (14:15 +0200)
committerjenkins <jenkins-int@bgbm.org>
Fri, 16 Apr 2021 12:15:13 +0000 (14:15 +0200)
1  2 
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java

index f222948442126dd4defe9a3e9a1f054460a035b7,0cb41587224de38f6e527f759adfc6472f1f6213..9526758c7a0822b25aae12ecfb86aa5934545fd7
@@@ -21,11 -21,10 +21,11 @@@ import eu.etaxonomy.cdm.api.service.Upd
  import eu.etaxonomy.cdm.api.service.dto.CreateTaxonDTO;
  import eu.etaxonomy.cdm.model.common.Language;
  import eu.etaxonomy.cdm.model.common.LanguageString;
- import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
+ import eu.etaxonomy.cdm.model.reference.NamedSource;
  import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
  import eu.etaxonomy.cdm.model.taxon.TaxonNode;
  import eu.etaxonomy.cdm.model.taxon.TaxonNodeStatus;
 +import eu.etaxonomy.cdm.persistence.dto.MergeResult;
  import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
  import eu.etaxonomy.taxeditor.l10n.Messages;
  import eu.etaxonomy.taxeditor.model.MessagingUtils;
@@@ -71,16 -70,15 +71,15 @@@ public class NewTaxonNodeWizard extend
                TaxonNode parent = getParentEntity();
  
                Map<Language, LanguageString> notes = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getMultiLanguageTextExcludedNotes();
-               DescriptionElementSource source = parent.getSource().checkEmpty()? null: parent.getSource();
+               NamedSource source = parent.getSource().checkEmpty()? null: parent.getSource();
  
                TaxonNodeStatus status = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getTaxonNodeStatus();
                if (status == null){
                    notes = null;
                }
  
-               result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, source, parent.getMicroReference(),
-                        status, notes);
+               result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(),
+                       taxon, source, parent.getMicroReference(), status, notes);
  
  
                if (result.isOk()){