Project

General

Profile

« Previous | Next » 

Revision fe720b6e

Added by Andreas Müller over 1 year ago

ref #9664 adapt vaadin to nomenclaturalTitleCache

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/TaxonNamePopupEditor.java
626 626 
        TeamOrPersonBase<?> inferredCominationAuthors = inferCombinationAuthors();
627 627 
        if(inferredExAuthor != null && inferredCominationAuthors != null
628 628 
                // comparing by nomTitle to detect duplicates:
629 
                && inferredExAuthor.getNomenclaturalTitle().equals(inferredCominationAuthors.getNomenclaturalTitle())) {
629 
                && inferredExAuthor.getNomenclaturalTitleCache().equals(inferredCominationAuthors.getNomenclaturalTitleCache())) {
630 630 
            // If and only if ex author = author the ex author is not included
631 631 
            // into the author teams due to the ICN 46.10. (see #8317)
632 632 
            inferredExAuthor = null;
src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest-deleteTest.xml
5 5 
  <ORIGINALSOURCEBASE DTYPE="NomenclaturalSource" ID="5000" UUID="5e7828f0-e34e-41c0-a47b-a11c8978899d" SOURCETYPE="PTS" CITATIONMICROREFERENCE="11-45" CITATION_ID="5000" SOURCEDNAME_ID="5000" />
6 6 
  <ORIGINALSOURCEBASE DTYPE="NamedSource" ID="5001" UUID="0fe91bd5-bfe7-4221-8efd-7ae5f307a3ec" SOURCETYPE="PTS" CITATION_ID="5000"/>
7 7 
  <ORIGINALSOURCEBASE DTYPE="NamedSource" ID="5002" UUID="23e79922-78af-4be6-8042-8e1de03b8717" SOURCETYPE="PTS" CITATION_ID="5000"/>
8 
  <AGENTBASE DTYPE="Team" ID="5000" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" HASMOREMEMBERS="false" />
8 
  <AGENTBASE DTYPE="Team" ID="5000" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLECACHE="Novis, Braidwood &amp; Kilroy" HASMOREMEMBERS="false" />
9 9 
  <HOMOTYPICALGROUP ID="5000" UUID="042ac145-cf9f-47c2-b4a1-8a4350e234eb"/>
10 10 
  <REGISTRATION ID="5000" UUID="c8bb4e70-ca85-43c3-ae81-c90a2b41a93f" STATUS="PREP" NAME_ID="5000" />
11 11 
  <DERIVATIONEVENT ID="5000" UUID="42610c79-b50f-4d86-94e6-9f775266f6e5" TYPE_ID="1998"/>
src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.deleteTypeDesignationTest-result.xml
4 4 
  <REFERENCE ID="5000" UUID="45804c65-7df9-42fd-b43a-818a8958c264" PROTECTEDTITLECACHE="false" TITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64" ABBREVTITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" PROTECTEDABBREVTITLECACHE="false" REFTYPE="ART" AUTHORSHIP_ID="5000" />
5 5 
  <ORIGINALSOURCEBASE DTYPE="NomenclaturalSource" ID="5000" UUID="5e7828f0-e34e-41c0-a47b-a11c8978899d" SOURCETYPE="PTS" CITATIONMICROREFERENCE="11-45" CITATION_ID="5000" SOURCEDNAME_ID="5000" />
6 6 
  <ORIGINALSOURCEBASE DTYPE="NamedSource" ID="5002" UUID="23e79922-78af-4be6-8042-8e1de03b8717" SOURCETYPE="PTS" CITATION_ID="5000"/>
7 
  <AGENTBASE DTYPE="Team" ID="5000" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" HASMOREMEMBERS="false" />
7 
  <AGENTBASE DTYPE="Team" ID="5000" UUID="05555fcb-72bf-49d0-9677-4de87f13e9ed" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLECACHE="Novis, Braidwood &amp; Kilroy" HASMOREMEMBERS="false" />
8 8 
  <HOMOTYPICALGROUP ID="5000" UUID="042ac145-cf9f-47c2-b4a1-8a4350e234eb"/>
9 9 
  <REGISTRATION ID="5000" UUID="c8bb4e70-ca85-43c3-ae81-c90a2b41a93f" STATUS="PREP" NAME_ID="5000"/>
10 10 
  <DERIVATIONEVENT ID="5001" UUID="50537c4e-e8cf-45e7-9e9d-e73197d17be8" TYPE_ID="1998"/>
src/test/resources/eu/etaxonomy/cdm/service/SpecimenTypeDesignationWorkingSetServiceImplTest.xml
2 2 
<dataset xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../database/schema/dataset.xsd">
3 3 
  <TAXONNAME ID="5000" UUID="47d9263e-b32a-42af-98ea-5528f154384f" NAMETYPE="ICNAFP" PROTECTEDTITLECACHE="false" TITLECACHE="Planothidium victori" FULLTITLECACHE="Planothidium victori in - undefined journal -: 11-45" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" PROTECTEDFULLTITLECACHE="false" AUTHORSHIPCACHE="" BINOMHYBRID="false" GENUSORUNINOMIAL="Planothidium" HYBRIDFORMULA="false" MONOMHYBRID="false" NAMECACHE="Planothidium victori" PROTECTEDAUTHORSHIPCACHE="false" PROTECTEDNAMECACHE="false" SPECIFICEPITHET="victori" TRINOMHYBRID="false" ANAMORPHIC="false" HOMOTYPICALGROUP_ID="5000" RANK_ID="765"/>
4 4 
  <REFERENCE ID="5000" UUID="45804c65-7df9-42fd-b43a-818a8958c264" PROTECTEDTITLECACHE="false" TITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" NOMENCLATURALLYRELEVANT="false" PARSINGPROBLEM="0" PROBLEMENDS="-1" PROBLEMSTARTS="-1" TITLE="P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64" ABBREVTITLECACHE="Novis, Braidwood &amp; Kilroy, P.M. Novis, J. Braidwood &amp; C. Kilroy, Small diatoms (Bacillariophyta) in cultures from the Styx River, New Zealand, including descriptions of three new species in Phytotaxa 64 in - undefined journal -" PROTECTEDABBREVTITLECACHE="false" REFTYPE="ART" AUTHORSHIP_ID="5000"/>
5 
  <AGENTBASE DTYPE="Team" ID="5000" UUID="5e7b791e-d17f-4378-9a47-923ebebc9b6a" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLE="Novis, Braidwood &amp; Kilroy" HASMOREMEMBERS="false"/>
5 
  <AGENTBASE DTYPE="Team" ID="5000" UUID="5e7b791e-d17f-4378-9a47-923ebebc9b6a" PROTECTEDTITLECACHE="true" TITLECACHE="Novis, Braidwood &amp; Kilroy" PROTECTEDCOLLECTORTITLECACHE="false" PROTECTEDNOMENCLATURALTITLECACHE="true" NOMENCLATURALTITLECACHE="Novis, Braidwood &amp; Kilroy" HASMOREMEMBERS="false"/>
6 6 
  <HOMOTYPICALGROUP ID="5000" UUID="76cb5ec1-ac61-4c40-a0e2-1bb738f04575"/>
7 7 
  <ORIGINALSOURCEBASE DTYPE="NomenclaturalSource" ID="5000" UUID="b249de96-98ae-453d-bd7d-0d784c2b2789" SOURCETYPE="PTS" CITATIONMICROREFERENCE="11-45" CITATION_ID="5000" SOURCEDNAME_ID="5000" />
8 8 
  <REGISTRATION ID="5000" UUID="c8bb4e70-ca85-43c3-ae81-c90a2b41a93f" STATUS="PREP" NAME_ID="5000" />

Also available in: Unified diff