EDIT

Add null check to handler (#5283)

Trim code

Fix child hierarchy for DnaSamples

• Fixed adding and displaying of sub derived units like e.g. media

Fix null selection for existing media

Adapt transient services

Update transient services with new merge method

Add remoting checks for merge, Move to merge call which returns updated transient object

Add check to ensure merge in editors is performed only in remoting

#5247 Fix duplicate entity issue for new entities by using the new merge service method which returns the input transient object

#5247 Use updated entities

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)

Delete unused method

Expand polytomous key section #3461

Fix media view selection

Disable media view when synonym selected (#5195)

Cache the default feature tree

#5252 Add remove method to manually remove root derivate

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewDerivedUnitBaseWizard.java

Fix initialization problems for preferences and editor input

Open a newly created specimen in specimen editor

re-initialise group object in input constructor

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/create/NewSpecimenHandler.java

#5242, #5223 Improve performance of derivate loading and editing

Use wizard to create new specimen

Keep media view and factual data view enabled when no significant
selection occurs (#5195)

Trim code

Merge branch 'develop' into remoting-4.0

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

Disable media view for taxon bulk editor with no selection (#5162)

I18n for derivative module

I18n for Specimen Editor

Add new service call

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

Merge branch 'develop' into remoting-4.0

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

Add unimplemented methods

#5213 Use method to move descriptions using uuids

Add annotation service to config

Trim code

Replace saveOrUpdate with merge

#5052 Integrate remoting in granted authorites editor

Fix new occurrence / sequence move method calls

Correct transient service method

#5187 Use new move methods with uuids as args

Update operation for move taxon nodes

Add unimplemented methods

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

#5188 Add special for deleting sequence

#5186 Fix erros in sequence merge and creating new specimen

minor

change preferences page for taxonnode sort

adapting transient service implementation to changes in cdmlib

• deprecated method removed

fixing #5150

Fix NPE

#5143, #5144 Improve load performance for name editor

Move Base operations test class to right package

Disable MediaView for bulk editor (#5162)

• bulk editor does only activate media view when showing taxa
• code trimming

Move property tester to editor plugin

#4073 Initial implementation of local cdm-server

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

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

changes for move descriptions and description elements

Remove comments

Rename Derivative View to Derivative Editor

fix jenkins

minor

fix delete polytomouskeynode and improve merge in bulk editor

#5130 Extend import wizards to import data via remoting and Add tests for the same

#5123, #5124 Make ChecklistEditor remoting session aware and fix performance issue with available distribution pereference page

Fix Polytomous Key duplicate entry issue

Add remoting operation / handlers for key list editor

Fix duplicate entity issue with newly created cdm entities

Use new find method with update

Add unimplemented methods to transient service

Update transient service to be compatible with cdmlib service

#5010 : Initial commit to fix duplicate entry issue when creating new key node

Update operation calls to use uuids as arguments

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

Merge branch 'develop' into remoting-4.0

Conflicts:
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java

Update handlers to use uuids inarguments

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

#5067 Integrate remoting sessions in derivate hierachy views, Adapt existing actions

Refactor ICdmViewer framework

Removed unnecessary ExecutionEvent

Make editor transient term service compatible with cdmlib term service

#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

#5010, #5046 Integrate remoting in polytomous key editor

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

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

adapt service call to model change