EDIT

Do not show taxon-specific deletion options when deleting
classifications

fix #5759 remove all switches for remoting and standalone

#5536

minor

smaller changes for drag & dop with natural order in taxonnavigator

minor

fix Ticket #5642

merge of origin develop

fix #5289

smaller changes to fix moving of taxonnodes

minor

Remove CdmViewerChooser from double-click functionality of taxon
navigator

Fix double click on taxa in taxon navigator and search results

Remove "edit" commands which are replaced by generic cdmViewer framework

fixing #5341 and colouring for cache relevant fields #4915 and #4944

Pre-select classification for remote moving operations

last changes for #5325

fix move taxonnode in natural order

Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop

fix #5261 and minor

Performance tuning

Cleanup DeleteOperation

improve messaging for deleteresults

merge with local branch

fix delete of taxon which is in two classifications and has children

Merge branch 'remoting-4.0' into develop

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/pom.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/handler/CreateFieldUnitHandler.java

Pre-select current classification for taxon node selection dialog
(#3462)

#5237 Add changes from stand alone handler

#5234 Add correct updated objects to change event

#5214 Fix initialization of remoting session

Update operation for move taxon nodes

Correct merge

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java...

moving taxonnode with drag & drop as predecessor fixed

error handling in deleteHandler/operation of navigator

moving more than one taxon node, merge of team and person, reusing name for new taxon

Add entity type to CdmChangeEvent and fixes #5139

Merge branch 'develop' into remoting-4.0

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

small changes for ideas for better drag and drop in taxonnavigator

white spaces

minor

minor

#5139 Add refresh of classification when new taxon is direct child or root node

#5029 Implement oneclick login for remoting

Correct issues from last merge

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...

Fix renamed TaxonNodeComparator

changes for #4908

changes for #4908

add the possibility to configure the deletion of taxon nodes

Add method to sessionOwner objects to fine tune performance using property paths

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

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

Revert "index on develop: 6992bef Rename NonViralName authorteams to authorship #4968"

This reverts commit 32cded397931ad359f7818fdfb91a113a074342e.

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

Conflicts:
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeComparator.java

Delete renamed file

Fix remaining conflict

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...

#5007 : Rename move taxon node handler

Fixes from Katja for commit issue

#5007 : Integrated remoting handler / operations for taxon navigator ui

#5007 : Add remoting handler / operations for the taxon navigator

TaxonNavigator : added refresh of navigator on data change
TaxonNavigatorLabels : new interface with label strings used by taxon navigator handlers
RemotingChangeAcceptedTaxonToSynonymHandler : using TaxonNavigatorLabels
RemotingMoveFactualDataHandler : remoting version of move factual data handler...

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...

RemotingCdmUpdateOperation : corrected exception handling
RemotingChangeAcceptedTaxonToSynonymOperation : new remoting operation class
server.properties : server properties for test

rebase from remoting-4.0 branch

plugin.xml : updated plugin for new remoting handlers
RemotingCdmHandler, RemotingCdmOperation, RemotingCdmUpdateOperation : new handler / operation architecture
RemotingChangeAcceptedTaxonToSynonymHandler : using new remoting handler design
CdmStorePropertyTester : added isRemoting test

fixed classpath issues and issues from last merge

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...

• added wizard page listener to react on ENTER key #4853

change synonym to accepted taxon message when taxon could not be deleted

delete taxonnode if taxon is used somewhere else fixed

• fixed compile error and possible NPE #4810

fix potential NPE

fixed problems with new classes in merge

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...

corrected usage of service calls returning update/delete result objects

minor

make the order of the taxon nodes editable

fixed potential NPE see Ticket #4854

Partial fix of Ticket #4728

partial Fix of #4728

Fix Ticket #4729

• fixed exception when changing accepted taxon to synonym of itself

for drag & drop it is now possible to move a taxonnode as a child node of the classification

• added Open in Taxon Editor command to Taxon Bulk Editor (#4536)

• refactored delete configrator dialog
  • added dialog to derivate deletion

CdmTransientEntityCacher, EntityCacherDebugResult : moved debug methods to debug result class
ProxyUtils : new class for util methods to do with hibernate proxy objects
ICdmEntitySessionEnabled, CdmEntitySessionInput, PolytomousKeyEditorInput, TaxonNameEditor, PolytomousKeyViewPart, TaxonNavigator, AbstractCdmViewPart, MultiPageTaxonEditor : Added getRootEntities method...

• added configurator settings to taxon deletion dialog

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...

CdmModelCacher : added recursive search in super classes
CdmTransientEntityCacher : corrected caching
EntityCacherDebugResult : new debug result object
CdmEntitySession, ICdmEntitySession, MockCdmEntitySession : added debug method
CdmEntitySessionInput : new super class for editor input objects...

DeleteOperation, EditClassificationOperation, CreateClassification, CreatePolytomousKey, CreateTaxonNode : added ICdmEntitySessionEnabled to constructor
ChangeAcceptedTaxonToSynonymOperation / ChangeAcceptedTaxonToSynonymHandler, MoveTaxonOperation / MoveTaxonHandler, DeleteHandler , TaxonNavigator, Root : made cdm entity session aware

merge from trunk

• moved refresh out of for-loop

• added "Move Factual Data" option to navigator context menu