EDIT

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

#4574

fixed ticket #1639

• added command, handler, double click listener to open taxa from associated taxa section in details view
  • caught runtime exception for orphaned taxa

• removed unused variable

Moved all logging and dialog functionality to the new class MessagingUtils.
Refactoring code to adapt to above change.
Added new custom error dialog - CdmErrorDialog
Added runtime exception handling to the ApplicationWorkbenchAdvisor by adding a custom status handler

Commenting out single click opening of name editor (ticket 4300)

LockMode issues in transient services

adaption for error handling of delete methods

open Taxonpage with single click in taxonnavigator

minor

• not running imports and exports deleted from menu
• preferences for concept relations fixed
• open taxon editor with one click in taxon navigator

adding a taxon bulk editor and changes because the delete methods does not throw exceptions anymore

#4114 sort order in taxon navigator

while fixing a bug, revert the setting of the comparator.

avoiding problems which where due to a fix for ticket #3822

with the fixed compareTo method the TaxonNodeComparator should work (#4114)

• removed StoreUtil.getCdmEntity() invocation (#4091)

Revert "#4114 sort order in taxon navigator " to avoid blocking bug

This reverts commit 1ef7ab55c5d437aba039bc10ee8d81e12f402309.

#4114 sort order in taxon navigator

avoiding NPE

dnd support in taxon navigator for Taxonnodes protected regarding user permissions - #4055 (action enablement adapts to the users granted authorities)

avoiding NPE and other exceptions

• added util method to get for getting a CDM entity (used in authenication/permission framework)
  • made use of this method where the type of the parameter was too general (like object)
  • made getBaseUnit() of DerivedUnitFacade public

base implementation and configuration for securing the editor - #4055 (action enablement adapts to the users granted authorities)

adding the operation and handler files

move the change accepted to Synonym Operation to taxon navigator.

• adapted sub classes of AbstractPostOperation

• extracted super class from AbstractPostOperation (same name)
  • created sub class AbstractPost Taxon/Describable Operation

delete whole classification with children

minor

maybe deproxy solves #3889

added conversationholder.commit fix to AbstractFilteredCdmResourceSelectionDialog and comments for this fix (with ticket number) for all files

improve delete of classifications

fix delete of classifications

smaller fixes