EDIT

Remove unused class

Merge branch 'develop' into unify_derivative_views

Adapt to service changes #5200

Fix type designation filter for derivative search

Fix label type info

Add type infop to derived unit label

Hide SearchBar when linking to taxon editor

Fix some labels and handle toggle states

Merge branch 'develop' into unify_derivative_views

Conflicts:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java

minor

#5325

Fix possible NPE and widget disposed exception

minor

last changes for #5325

#5297 Add remoting progress monitoring

#5297 Change active seesion variable to a inheritable thread local variable and add relevant tests

Add monitered operation

#5297 Add post monitor operation callback, Add report text dialog

#5297 Add progress monitor client manager...

Merge branch 'develop' into unify_derivative_views

Allow null as parent when moving derivatives

Removed "New Specimen" option from main menu

Remove double-click support for opening specimen from the factual data
view

Fix and refactor addImageGallerHandler

Merge branch 'develop' into unify_derivative_views

Implement handler for creating (non-)taxon associated FieldUnits

Add dynamic context menu entry for FieldUnit creation

Update taxon name in taxon selection element

Fix taxon assignment filter

Fix session problems with remoting

#5350 : Use newly added getTaxonNodeUuidAndTitleCacheOfAcceptedTaxaByClassification method with uuid

Add toggle button for link with editor

• search bar will be disabled when linked to editor
• also fixed tree initialization when listening to selection changes

Merge branch 'develop' into unify_derivative_views

Listen to selection changes in DerivateEditor

Listen to selection changes in DerivativeEditor

• Convert to ViewPart
• Add toolbar button to toggle listening to selection changes

fix #5342

#5256 Set entity container in Bulk Editor to dirty when media is updated

#5256 Add missing recursive load for MergeResult lists, Add setting of dirty flag for factual data in Buld Editor

Enable remote session support

Enhance search bar layout

Implement taxon assignment filter and refactor DerivativeEditor

• Input no longer needs session
• editor itself keeps track of its root elements
• taxon assignment filter allows filtering specimens with/without taxon assignment or both

Merge branch 'develop' into unify_derivative_views

#5335 Use new getLanguageByLabel methof in term service

#5268 Use convert methods which use uuids

fix #5261 and minor

fixing #5324 and #5325

add moveDescription to transientService

Update transient services for new load method

Update root entity merge calls to use new merge method.

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

#5114 fix

Merge branch 'develop' into unify_derivative_views

Implement filter for assigned specimens

• added drop down to select filter type
• implemented filtering of specimen list

Use convenience method for associated taxa

improve messaging for deleteresults

Fix layout of derivative tree

Delete unused classes

Refresh hierarchy tree after searching

Add "Show View" entry for derivative editor

Move derivative search view classes to taxeditor.editor

• adapted DerivateView

I18n of login and data source view

minor

merge branches

merge

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

improve messaging for deleteResult

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

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

move descriptions in a service call

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