EDIT

#5054 Update test for checking terms update

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java

#5056 Adapt editor to service layer 'save' method refactoring in cdmlib

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java

Make editor compatible with latest cdmlib service layer updates

#5012 Adding remoting session and updating save methods for Bulk Editor

Replace properties file with xml file

#5012 updates for making Bulk Editor remoting capable

Fix deletion of single reads in Derivative Editor

Add missing transient method

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/org/hibernate/collection/internal/AbstractPersistentCollection.java...

Update transient services with new delete method

#5009 Add operations and corresponding tests for delete / update nodes actions

#5009 : missed in last commit

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientClassificationService.java...

Fix issues with merge conflicts

Fixes from Katja for commit issue

adapt transient service methods to cdmlib changes

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteTaxonOperation.java...

fixed conflicts from last commit

all delete methods need an Uuid as argument

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientAgentService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientDescriptionService.java...

ICdmDataChangeService, CdmUIDataChangeService, CdmDataChangeService : added new data change service with different services for the ui and non-ui states
CdmApplicationState, CdmStore : added data change service to app state
CdmChangeEvent, ICdmChangeListener : added change listener and even to fire in case of data changes...

Merge branch 'develop' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/.gitignore
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java...

• added transient service methods

• removed inBetween target for Derivative Editor (fixes #4966)

Merge branch 'master' of wp5.e-taxonomy.eu:/var/git/taxeditor into remoting-4.0

Conflicts:
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java...

minor

cdmlib-ehcache : removed disk based cache manager since the hb config is now cached in memory
CdmApplicationRemoteController, CdmModelCacher, CdmRemoteCacheManager, CdmModelGetMethodCacherTest : running the hibernate config load in separate thread
CdmTransientEntityCacher, EntityCacherDebugResult, CdmStore, SessionsViewPart: refactoring...

CdmApplicationRemoteController : refactoring code to simplify application context loading and making it performant
CdmModelCacher : removed unused method
CdmRemoteCacheManager : moved cache from disk to memory
httpInvokerServiceClients : lazy initializing all service beans...

moving UuidAndTitleCache from model to persistence (changes in Editor). #4799

fixed problems with merge

Merge branch 'move-to-luna' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/eu/etaxonomy/cdm/remotingApplicationContext.xml...

added cdm entitysession enabled objects to operations

• added transient service methods

• missing @Override

#4855 add MoveSynonymToAnotherAcceptedTaxonHandler and some clean up of the plugin.xml especially the delete

• changed "derivate" to "derivatives"

• added sorting by title cache of specimens to individual associations in factual data view

minor

Partial fix of Ticket #4728

• fixed title for Uses view part

fix NPE bug and termloading bug for Usage Records #4247

adjusted old comment to code block

Fixed Ticket #4557

Fix issue #3656

• added findOccurrences() and countOccurrences() to service layer
  • added configurator for these methods
  • optimized retrieval with HQL query
  • made use of service method in DerivateSearchView

fix new methods in agent service for transient services

• added missing cdmlib method

• added check for open derivate editor command
  • set title of factual data view corresponding to the current selection

• adapted transient service to cdmlib changes

• fixed possible NPE

• refactored DTO assembly for compressed specimen table in the data portal
  • now data is assembled for each individual preserved specimen and the for the parent field unit

Fixed column bug for checklist editor....

Removed Reference Tab from checklist editor....

• enabled supplemental view for ConceptView (#4681)

• added derivate hierarchy section
  • refactored DerivateContentProvider

merge from trunk

made up-to-date with service layer changes

• fixed possible NPE

• added context menu optio to create a media specimen with an existing media (fixes #2385)

• fix for java 1.6 compatibility

• added context menu option to open multiple specimen IndividualsAssociations from the factual data view

• fixed MediaViewPart selection listening (#4575)

• refactored delete configrator dialog
  • added dialog to derivate deletion

• removed default configurator setting

#4658

ticket #4575

• added missing transient service methods

show media information for taxa in bulk editor

CdmTransientEntityCacher : overriding cache field only in the case of initialised cdm entity
CdmEntitySession, ICdmEntitySession, MockCdmEntitySession : added update + delete methods
DeleteSynonymOperation, MoveFactualDataHandler : changed service call to uuid one...

MultiPageTaxonEditor : added cdm entity session capabilities to update and register data changes
TaxonNavigator, TaxonNavigatorDataChangeBehavior : added refreshing of specific objects
MoveFactualDataHandler : moved business logic to service call using uuids...

MoveDescriptionToOtherTaxonOperation, MultiPageTaxonEditor, ChangeSynonymToAcceptedTaxonHandler, DeleteTaxonBaseHandler, ChangeSynonymToAcceptedTaxonOperation, DeleteTaxonBaseOperation, DeleteTaxonOperation, MoveDescriptionToOtherTaxonHandler : indentation...

factual data for bulkeditor, improving referencing objects view, make delete in bulkeditor visible for synonyms

Extend TransientClassificationService to be compliant with CdmLib

• delete description CDM entity when invoking Delete*DescriptionOperation (fixes #4605)

• fixed unnecessary double checking

• added double-click functionality for IndividualsAsscociations which opens the clicked specimen in the DerivateEditor

• code cleanup

• added transient service

adapt services to new findByIdentifer in Editor

• extended DeleteHandler to also handle deletion of SpecimenDescriptions in FactualDataView

• close Derivate Editor if all elements are deleted

merge validation editor branch to trunk

fix transient repository issue

update Transient services

• added option for deep delete (with children) to DerivateEditor

• added context menu option to create a new FieldUnit in DerivateEditor

• allow creation of derivates only when editor is not dirty

• adpated to cdmlib changes

• adapted to 3.4.0 cdm changes

merged trunk into branch

• fixed possible ClassCastException (#4533)

Fixed Bug #4531

Added a reload function so that the checklist editor doesn't need to be relaunched after adding terms.

• added service method to get descriptions which have a specimen set as describedSpecimen
  • added test which fails because the XML is loaded incorrectly

• added delete result as warn message

• adapted to method signature change in cdmlib

• deleted usage of commented method in cdmlib

adapt transientServices to returntype of isdeletable methods