EDIT

ref #6401 better distinguish IdentifiableEntity.compareTo from DefinedTermBase.compareTo

• this is to avoid jumping to IdentifiableEntity.compareTo if DefinedTermBase.compareTo does not match generics exactly

Cleanup

Cleanup

ref #6401 Fix problems with generics due to jdk1.8

ref #6362 remove further occurrences of NonViralName

ref #6365 use TaxonNameFactory for static parser methods

ref #6365 use TaxonNameFactory for botanical names

ref #6365 use TaxonNameFactory for zoological names

fix #6360 use TaxonNameFactory for NonViralNames

fix #6364 use TaxonNameFactory for viral and bacterial names

fix #6366 use TaxonNameFactory for cultivar names

ref #6365 Move zoological parse methods to TaxonNameBase

Remove isCodeCompliant from TaxonNameBase

ref #6366 move cultivar attributes and functions to TaxonNameBase

cleanup

ref #6365 merge static methods from BotanicaName to TaxonNameBase

ref #6365 ref #6360 ref #6364 replace taxon name factory methods

ref #6360 replace NonViralName factory methods

ref #6365 Move all ZoologicalName attributes up to TaxonNameBase

ref #6364 Move all BacterialName attributes up to TaxonNameBase

ref #6364 Move all ViralName attributes up to TaxonNameBase

minor

ref #6369 adapt existing occurrences of interface to removed generics

ref #6369 remove generics from interfaces

fix #6369 add interface for all names

ref #6369 add IViralName interface

ref #6369 add remaining interfaces

ref #6362 removed some NonViralName occurrences (make it compiling again)

ref #6369 Add interfaces for TaxonNameBase and NonViralName

cleanup

ref #6362 removed some NonViralName occurrences (non-compiling as changing in model are still missing)

Revert "Revert "ref #6369 Add interfaces for TaxonNameBase and NonViralName""

This reverts commit 949c09b142f2806539e3fb399bef980d3e17e293.

Revert "Revert "fix #6360 moved all NonViralName functionality to TaxonNameBase""

This reverts commit 9b9d0a956d78e3aec1024bc0a5fa33f33e5b33aa.

Revert "fix #6360 moved all NonViralName functionality to TaxonNameBase"

This reverts commit 7d8c96134bda3c11d053df2e8e5d03f32a500ee3.

Revert "ref #6369 Add interfaces for TaxonNameBase and NonViralName"

This reverts commit 1e42628a4c24232f9b03a2a1e508d7cd79e0e0ba.

ref #6369 Add interfaces for TaxonNameBase and NonViralName

fix #6360 moved all NonViralName functionality to TaxonNameBase

Initialise sample designation to format keys for IdentifiableEntity

ref #6320 Add pherogram title cache to format keys

Add new English quotation marks

cleanup

missing changes for repair methods and cdmPreferences in editor

ref #6190 removing svn property place holder in first line of code

minor to fix the failing test

ref #6283: minor changes to fix exceptions in polytomous key editing

ref #6283: fix NPE exceptions caused by null values in children list

ref #5762 Rights to be reusable, still need to update existing unique

ref #3934 add department to NamedAreaLevel

cleanup (including deprecated methods in Media)

Cleanup and new Rights Factory method

fix #6244: add removeNullValues in updateSortindex method to avoid exception when collection contains null values

fix #6134 add group taxa by marker and refactor treeindex handling

Cleanup

ref #6211 cleanup old code

fix #6211 fix API incompatibility

fix #6211 reduce initialization for synonymy

ref #6220 javadoc

fix #6220 Improve isOrphaned definition for Taxon.

ref #6199 test for reading excluded, unplaced and excludedNote

solving polytomouskey node sort index problems

Latest BM import updates for Salvador

fix #6200 Change order of NomenclaturalCodeUpdater and allowOverride adder to avoid null values

Remove deprecated adder methods for multilanguage text

ref #5634 add getter and putter for excluded note

ref #5970 remove transient from allowOverride

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/description/TaxonInteraction.java
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestModelUpdate.java

fix #5680: get method needs to be named like the attribute

ref #4866 Create new description set when cloning taxon (avoid
HibernateException)

Merge branch 'develop' of ssh://dev.e-taxonomy.eu/var/git/cdmlib into develop

Conflicts:
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/ITaxonNodeService.java

fix TermIdInVocabularyComparator

Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/taxon/TaxonNode.java
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonDaoHibernateImpl.java
cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/TaxonNodeServiceImpl.java...

remove final from classification.description

ref #5634 fix clone issue for excludedNote

Cleanup language string handling and cloning

ref #5952 Add index to identityCache

ref #3658 further improvements for NomCode update

#5634 Add excludedNote to TaxonNode (still some tests not running)

ref #6099: removing cascading to child nodes and adapting the service and persistence layer

ref #3925 Move excluded and unplaced to TaxonNode

fix #5952 Add identityCache

ref #3658 Update nomenclatural code as CdmPreference (most probable value)

ref #5974 Replace synonymRelationshipType by SynonymType and replace some other occurrences of synonym relationship

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

fix #6089 Remove taxonomicParentCache and taxonomicChildrenCount, fix Testdata

fix #6089 Remove taxonomicParentCache and taxonomicChildrenCount from Taxon

minor

specimen import/search changes

fix #6072 Implement findIdentifiableEntityByMarkers

ref #6089 Remove all calls and methods for taxonomicChildrenCount and taxonomicParentCache

Cleanup; Delete unnecessary test classes.

Add Vorabdr. to parsable volume

Add javadoc for languages

fix #6060 parse author with -e-

rel #6057 further improvements for authors with accent grave

fix #6057 Accent Graph in author parser

fix #5893: set parse reference public to use it in fauna europaea import

fix #6030 Parse Genus hybrid formulas correctly

fix #6045: fixing the NaturalOrderComparator and complete the test

ref #6045 Fix NPE for TaxonNaturalComparator

• fix getAncestors() method of taxon node
• added JUnit test

fix #5869 adapt implementation for reusing names or taxa with remoting