EDIT

ref #9668: hotfix for secundum handling when swap syn and accepted - continue

ref #9668: hotfix for secundum handling when swap syn and accepted

cleanup

ref #9590 use boolean parameter newUuidForAcceptedTaxon instead of 2 different public methods (taxeditor)

ref #9340: check for different sec in homotypic group

ref #8767: add information when publish flag of the new taxon differs from the parent

ref #9340: workflow for changing synonym to acc and acc to synonym

ref #9340: secundum ref workflow for synonym to taxon

adapt changeSynonymToAcceptedTaxonOperation to new method parameters

minor update variable name -continue

ref #9267: warning message instead of confirm message box

ref #9267: add message if sec of new taxon differs from sec of new parent

ref #9173: code cleaning

ref #9173: do not use use EditorUtil.getEditor() to avoid NPE

cleanup

fix #8959: fix correct focus after move syn

cleanup

ref #9033: adapt editor to taxonnode.status

fix import

fix compile error

Merge branch 'release/5.10.0'

fix failing test

ref #8526: remove workaround for hotfix

fix #8526: fix problem swap synonym and taxon

fix #8526: fix problem swap synonym and taxon

ref #3472: adapt editor to changes in methods moving descriptions

refresh details when changing concept type

fix correct focus and selection after changing from synonym to MAN

fix correct icon refresh for concept relationship changes in name editor

ref #6913 Remove e3 context menu items and name viewer extensions

fix #7393: fix regression caused by removing cascading in relationships for new syn and concepts

fix creation of hybrids after deleting cascading in relationships

Fix potential NPE

ref #7393: fix regression for deleting cascading from relations

some smaller changes for drag & drop of factual data

ref #2380: implement usage of Dto for taxon navigator

ref #6595 removed e3 name editor classes (unstable navigator plugin)

ref #6595 remove unused parameter

ref #6446 merge taxon name subclasses in TaxEditor

minor

adapt changeSynonymToAcceptedTaxonOperation to changed return type of service method

fix #6308: fix correct deletion handling of synonyms and misapplications and the right messages when delete a synonym with not deletable name

fix #6424: check if name is already persisted before trying to delete

ref #4611 complete i18n for taxeditor.editor plugin

• also created l10n package and moved Messages.java and teh messages.properties files there

ref #4611 i18n for taxeditor.editor plugin

ref #6419 renaming CdmApplicationDefaultConfiguration to CdmRepository

code cleaning

ref #6315: implement set secundum reference for subtree in editor

changes in misapplicationDeletionOperation

ref #6362 remove occurrences of NonViralName in code and some cleanup

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

ref #6219: add warning that synonym is deleted immediately

ref #5974 Remove synonym relationships (rename synRelType to synRel and others)

ref #5974 Remove synonym relationships (compiling)

Remove generics from Reference in TaxEditor #5830

fix move synonym to another taxon

#5114 fix

improve messaging for deleteresults

#5224 Using new cdmlib call for changing synonym to accepted taxon

Update operation calls to use uuids as arguments

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

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

adapt service call to model change

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

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

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

ticket #4804

improve messaging

bug fixxing in bulk editor and referencing objects view
bug fixing in deletion of names and homotypical groups

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

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

merge from trunk

• added TaxonDeletionConfigurator to delete operations

fixing problems in bulkeditor and minor

fix #2187

DeleteResult handling in DeleteSynonymOperation

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

#4242 delete MA

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

fix problem with changeSynonymToAcceptedTaxon of a synonym being part of an homotypical group

refactoring CdmApplicationConfiguration/Controller to allow for remoting
CdmStoreConnector : added application configuration call for remoting (currently commented)

move ChangeConceptToSynonym business logic from editor operation to service layer

merge from trunk

merge from trunk

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

fix deleteAllEmptyNames

fix the error caused by the delete functionality in the service layer

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