EDIT

fix compile errors after cleanup

ref #7901: adapt test to cleanup in PreferencePredicate

ref #7932 first implementation of PreferenceResolver and some adaption to PreferenceService API.

• Correct handling of subtree subjects still open.
• Also creation of user defined subjects still open.

ref #7745 implement subtree filter for ClassificationController.rankSpecificRootNotes and .childNodes

ref #7644 handle continued in getYear()

fix #7644 fix failing test in parser and add "continued" parsing to all relevant patterns

ref #7644 some further fine tuning on setting CONTINUED/end date in TimePeriod and some cleanup

ref #7644 implement "continued" in TimePeriod, still missing for most of the formats in parser

minor

ref #6752 stricter handling of Reference.setDatePublished (only for calling methods)

ref #6752 strictly use VerbatimTimePeriod where possible

fix #7074 Change Media.mediaCreated to TimePeriod and make let PartialUserType support hour and minute

ref #6752 implement verbatimDate for Reference (Parser and Formatter still missing)

cleanup

ref #6720 make individualCount a string

cleanup

ref #6241 replaced @created by @since in cdmlib

ref #7386 reducing redundancy in name relationship handling methods, adding methods for general use

ref #6241 change @date to @since (fix)

ref #6241 change @date to @since

cleanup and move clone test methods to specific classes

ref #7357 fix test for CategorialData.clone and move it from DescriptionElementTest to CategoricalDataTest

cleanup

ref #7357 implement clone correctly for TypeDesignationBase

cleanup

whitespace

minor

fix failing clone tests

add comparator test for sortByName

ref #6903 preferences for vaadin

add uuid list as return type for CdmPreference.getValue

fix #6842 fix bugs in Registration.setName

cleanup

ref #6630 and ref #6368 remove generics from TaxonName

ref #6630 unified all taxon name cache strategies except for ViralNameDefaultCacheStrategy

fix #6368 rename table and class TaxonNameBase

ref #6368 remove TaxonNameBase subclasses

fix #6535 change CdmMetaData.propertyName from int to string

cleanup

fix #6367 make nomenclaturalCode an attribute of TaxonNameBase

adapt GrantedAuthorityImpl factory method

ref #6449 Avoid empty titleCaches if only one cache is protected

cleanup

ref #922 move compareTo test to subclasses

cleanup

cleanup merge problems

ref #6362, ref #6365 remove occurrence of NonViralName, BotanicalName, ZoologicalName and others

#6401 update generics for java1.8 upgrade

Cleanup

cleanup

fix #6311 move compareToEntity method to TaxonName and TaxonBase classes and refactor

ref #6401 fix compilation errors in OrderedTermBaseTest

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

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

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

Remove isCodeCompliant from TaxonNameBase

ref #6366 move cultivar attributes and functions to TaxonNameBase

ref #6365 merge static methods from BotanicaName to TaxonNameBase

ref #6365 replace ZoologicalName 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 #6369 adapt existing occurrences of interface to removed generics

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

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.

fix #6360 moved all NonViralName functionality to TaxonNameBase

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

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

missed to add the adapted test

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

add test for ermIdInVocabularyComparator

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

Conflicts:
cdmlib-db/pom.xml
cdmlib-ext/pom.xml
cdmlib-io/pom.xml
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/excel/taxa/NormalExplicitImport.java
cdmlib-io/src/main/java/eu/etaxonomy/cdm/io/specimen/SpecimenImportBase.java...

fix clone test for Media

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

ref #5974 Remove synonym relationship first compiling implementation in cdmlib

cleanup

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

ref #6045 Add test for getAncestor()

cleanup

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

ref #6045 Add test for getAncestor()

Further develop the CDM preferences #3958

Remove generics from Reference in cdmlib-model #5830

Adapt reusability of Credits / Rights

Remove bidirectionality for supplemental data #5743

Fix sort order for nom illeg with date #3338

Include nom. illeg. in homotypic group ordering #3338

Some additional tests for sorting homotypical groups #3338

Add circular check for homotypicgouptaxon comparator #3338

Include rank comparison in HomotypicGroupTaxonComparator #3338

Improve sort order within a homotypic group (new Comparator) #3338

Improve sort order within a homotypic group (new Comparator) #3338

organizing imports