EDIT

fix move taxonnode in natural order

fix #5261 and minor

Cleanup DeleteOperation

improve messaging for deleteresults

merge with local branch

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

#5234 Add correct updated objects to change event

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

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.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF...

changes for #4908

#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

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

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

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

make the order of the taxon nodes editable

• fixed exception when changing accepted taxon to synonym of itself

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

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

• 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

LockMode issues in transient services

adaption for error handling of delete methods

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

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

fix delete of classifications

smaller fixes

minor

merged model adaptions to cdmlib 3.2.4 from campanula branch

updates for 3.3 model changes. Phase two commit, which contains method changes / updates

Fixes #2733

had to rename the packages to make them compliant with buckminster