EDIT

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

#5252 Add remove method to manually remove root derivate

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

Merge branch 'develop' into remoting-4.0

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

I18n for derivative module

I18n for Specimen Editor

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

Trim code

Fix new occurrence / sequence move method calls

#5187 Use new move methods with uuids as args

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

Disable MediaView for bulk editor (#5162)

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

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

Rename Derivative View to Derivative Editor

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

Update ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

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

Fix deletion of single reads in Derivative Editor

• removed inBetween target for Derivative Editor (fixes #4966)

• changed "derivate" to "derivatives"

• added derivate hierarchy section
  • refactored DerivateContentProvider

• fixed possible NPE

• added context menu optio to create a media specimen with an existing media (fixes #2385)

• refactored delete configrator dialog
  • added dialog to derivate deletion

• close Derivate Editor if all elements are deleted

• added option for deep delete (with children) to DerivateEditor

• added context menu option to create a new FieldUnit in DerivateEditor

• allow creation of derivates only when editor is not dirty

• added delete result as warn message

• deleted usage of commented method in cdmlib

• fixed possible NPE when opening DerivateView for a taxon when no derivates exist

• re-enabled MediaViewPart for DerivateView (#4475)

• added clear button to DerivateSearchView
  • made use of cdmlib service to get associated specimen for one taxon (#4506)

• added context menu entry to taxon navigator to open associated derivates in DerivateEditor
  • added taxon filter to DerivateSearchView (non-functional) (#4506)

• added static method to DerivateLabelProvider to get the derivate text
  • refactored moving of derivates to use the operation framework.
  • immplemented undo/redo

• DerivateView and BulkEditor trigger selection change event for MediaViewPart (fixes #4475)

• extended DerivateSearchView to allow multiple selection
  • added context menu to open multiple elements in DerivateView
  • extended DerivateView to show multiple derivate hierarchies in one view

• refactored DerivateViewEditorInput to use UUIDs instead of CDM entities
  • added delete operation to DerivateView (currently only deleting leafs of the derivate tree is allowed)

• used more pepresentative DerivationEventTypes when creating derivates via DerivatView

• fixed class cast exception

• adapted derivate hierarchy assembly to cdmlib3.4 changes (TissueSample, DnaSample as one class)

• generalized sample designation GUI elements
  • added sample designation to TissueSample details view
  • added some more parameters to TissueSample details view

• added empty "Delete Derivate" functionality to DerivateView

merge-update from trunk

• rename IDirtyMarkableSelectionProvider to IDirtyMarkable
  • extended interface IDirtyMarkable #2645
  • added method forceDirty()

merge-update from trunk

• added support for image gallery creation for FieldUnits (#4389)
  • added support for DerivateView to MediaView

merge-update from trunk

• fixed possible LazyInitializaitionException in DerivateLabelProvdider

merge-update from trunk

• fixed typo

merge-update from trunk

• implemented setFocus() of all EditorParts
  • this is to avoid "java.lang.Exception: java.lang.RuntimeException: WARNING: Prevented recursive attempt to activate part"
  • either set the focus to shell or set it to the viewer used

fix for #2754

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

• added missing entry for context menu in DerivateView

• expand branch in DerivateView where a new derivate created and select the derivate

• generalized adding MediaSpecimen in DerivateView

• commented workbenchShutdown() content

• fixed potential session exceptions during closing/saving

• changed error dialog text

• added feedback if drag&drop in DerivateVie does not work

• added new dynamic context menu for DerivateSearchView
  • cleaned up code

• added conversation/session support to DerivateLabelProvider
  • GUI widgets using the provider need to provide a conversation/session to avoid LazyInitializationException

• implemented differentiation of the three image types (Artwork, Living Plant Photo, Specimen Scan) in the DerivateView and DetailsView

• implemented derivate specific textual representation in DerivateView

• removed debug/test code

• wrapped DerivateView selection to pass a handle on one DerivateView when dragging into another allowing refresh on that view

• only allow dragging in DerivateView when view is not dirty
  • added missing methods to transient services
  • exposed dto package in cdmlib project
  • some renaming

• removed unused PropertyTester

• fixed FactualData view to show data for selection of DerivateView
  • renamed util method

• added memento restore mechanism to DerivateView (partially)

• javadoc

• refresh view instead of setting the editor input

• cleaned DerivateView context menu code and classes

• refactored context menu for DerivateView to be programmatic instead of declarative (using plugin.xml)
  • fixed icon bug for DerivateSearchView

• only show Copy/Paste context menu for SingleRead/Sequence

• added update() method to DerivateView
  • display different icon for SingleReads linked to multiple Sequences

• added util method to get the TreeNode out of a selection

• added Copy/Paste for SingleRead->Sequence to DerivateView
  • copying actually just creates a link

• removed Amplification as a TreeNode from the DerivateView
  • added Amplification to DetailsView of SingleRead as an EntitySelectionElement

• fix cdmlib version number in .classpath (why does maven not generate this anymore?)
  • added "molecular" package to exported packages
  • organize imports for new molecular services

• used "move derivate" methods of service layer
  • added java doc

• moved move-logic to occurrence service layer

• added drag'n'drop support for Sequences
  • added context listener to DerivateSearchView
  • refactored MVC pattern of DerivateSearchView

• added support for SingleRead drag'n'drop

• implemented drag'n'drop support for SpecimenOrObservationBase in Derivate View

• minor

• minor enhancement

• added basic drag'n'drop support to DerivateView

• added context menu for TissueSample in DerivateView

• fixed context menu options

• refactored selection of DerivateView to be TreeNode
  • adapted selection handling
  • restructured derivate hierarchy
  • Amplifications are now a direct child of Sequences
  • the can only be created when having a SingleRead
  • this representation does not affect the cdm structure

• cleaned up package structure
  • removed campanula package

• changed static root element (FieldUnit) of DerivateView to the topmost derivate there is

• added MediaSpecimen DetailsView
  • added empty element if there is no details view available

• added support for creating and viewing SingleReads in DerivateView
  • added DetailsViews for SingleReads

• added Amplification and Sequence to DerivateView
  • added context menu entry for the creation of both
  • added DetailsViews for both

• added Amplifications and Seuqences (consensus) to derivate hierarchy (DerivateView)