EDIT

Removed OccurrenceView

Fix session problems with remoting

Add conversation/session support to OccurenceView

Listen to taxon selection

Fix potential class cast exception

Fix potential NPE

Fix typo

Add initial OccurenceView to RCP plugin

I18n of login and data source view

Disable expanding of key section (#3461)

Trim code

Add null check to derivate label provider (#5271)

Fix child hierarchy for DnaSamples

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

Change null session to singleton with no owner

Always search for FieldUnits in DerivativeSearchView

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

Expand polytomous key section #3461

Trim code

Add geoscopes and taxonomic scope as subsection to polytomous key detail
element

Add null check for session

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

#5223 Replace service methods with similar entity calls

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

Close conversation when closing DerivateSearchView

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

Avoid exception loop when taxon name is null (#4996)

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 ICdmEntitySessionEnabled to no longer extend ICdmChangeListener

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

Externalize cdmViewer extension point parsing

Add generic context menu for ICdmViewer framework

Refactor ICdmViewer framework

Removed unnecessary ExecutionEvent

#5067 Add remoting session to derivate search view

Add check to display statistice only when cache is alive

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

• split off "Preparation/Preservation section" from dna sample general section

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

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

• added context menu entry for editing classifications
  • used generic extension point for cdmViewer in navigation project (#4865)

• code conventions

cdmlib-ehcache : removed disk based cache manager since the hb config is now cached in memory
CdmApplicationRemoteController, CdmModelCacher, CdmRemoteCacheManager, CdmModelGetMethodCacherTest : running the hibernate config load in separate thread
CdmTransientEntityCacher, EntityCacherDebugResult, CdmStore, SessionsViewPart: refactoring...

• added identifier section to specimen details view

• moved OriginalLabelData to specimen details section (#4776)

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

InspectSessionsDialog : added filtering
CdmStore : clearing caches and session before connecting
ParseHandler : using NonViralName instead of TaxonNameBase
AbstractPostTaxonOperation, AbstractPostOperation, AbstractPersistentPostOperation : added CdmEntitySessionEnabled object to constructor...

• deproxy CDM entities to get correct class as part title of DetailsView

• show recordBasis for specimens as part title of DetailsView

• simplified part title of DetailsView

• unified section headers for derivative details view
  • show selected element in part title of DetailsView

• fixed filtering by specimen type (UNKNOWN = wild card)

• when searching for a taxon also the indirectly associated specimens of the derivative hierarchy are shown

• changed "derivate" to "derivatives"

• changed label provider according to requirements

• fixed possible widget is disposed exception

Forgot to check in for fix geographical Scope

fix NPE bug and termloading bug for Usage Records #4247

• i18n language preferences

• added findOccurrences() and countOccurrences() to service layer
  • added configurator for these methods
  • optimized retrieval with HQL query
  • made use of service method in DerivateSearchView

• removed duplicate barcode in label

• added icons for derivates which have character data attached

• fixed potential ClassCastException

• used most significant identifier for derivate labels
  • refactored session loading

• original label data uses multi line text field (#4565)
  • initially not expanded

• added derivate hierarchy section
  • refactored DerivateContentProvider

• refactored cdmViewer extension point to be more generic

• added missing class filter to cdmViewer popup dialog

• enhanced cdmViewer popup dialog
  • added java doc

• implemented framework which links an input element to viewers/editors which are able to display information about the element
  • added ICdmViewer interface
  • added extension point to register ICdmViewer
  • registered EditorCdmViewer for the taxeditor.editor plugin

OpenInspectSessionsHandler : handler for opening the inspect session dialog
CacheLoader : moved recursive logic from cdm transient cacher to new class
CdmServiceCacher : now uses CacheLoader to recursively load entities
CdmTransientEntityCacher : moved recursive logic from cdm transient cacher to new class and corrected caching issues...

CdmTransientEntityCacher, EntityCacherDebugResult : moved debug methods to debug result class
ProxyUtils : new class for util methods to do with hibernate proxy objects
ICdmEntitySessionEnabled, CdmEntitySessionInput, PolytomousKeyEditorInput, TaxonNameEditor, PolytomousKeyViewPart, TaxonNavigator, AbstractCdmViewPart, MultiPageTaxonEditor : Added getRootEntities method...

CdmRemoteCacheManager : added cache getter methods
CdmTransientEntityCacher, CdmEntitySession, CdmEntitySessionManager, ICdmEntitySession, ICdmEntitySessionManager, ICdmEntitySessionManagerObserver, MockCdmEntitySession, MockCdmEntitySessionManager , eu.etaxonomy.taxeditor.cdmlib/src/main/resources/cdmlib-ehcache.xml : added statistics config , getter method for live stats and observer to update when sessions are bound and disposed...

CdmModelCacher : added recursive search in super classes
CdmTransientEntityCacher : corrected caching
EntityCacherDebugResult : new debug result object
CdmEntitySession, ICdmEntitySession, MockCdmEntitySession : added debug method
CdmEntitySessionInput : new super class for editor input objects...

factual data for bulkeditor, improving referencing objects view, make delete in bulkeditor visible for synonyms

• fixed possible null label

• adapted details views and wizards to cdm changes (amplifaction + amplification result)
  • added missing parameters to details views

• temporarily commented compile errors

• added publish flag to DetailsView for SpecimenOrObservationBases (fixes #3951)

merged trunk into branch

• added special case handling for DerivateEditor so that the DetailsView only show data of the DerivedUnit and the FieldUnit #4474

• renamed interface IDerivedUnitFacadeEditor to IDerivedUnitFacadePart
  • show field unit data in NewDerivedUnitBaseWizard

• added interface IDerivedUnitFacadeEditor to tag editors that are working with DerivedUnitFacades (e.g. BulkEditor)
  • show field unit data for DerivedUnit when selected in BulkEditor

• added preference for displaying associated taxa in specimen details view

• added section for associated taxa (IndividualsAssocation, TypeDesignation) to DetailsView for specimen

• added amplification description to single read label in hierarchy
  • added marker to update method of amplification description

• layout enhancement

• added barcode to MediaSpecimen label

• moved extension point for taxon navigator context menu
  • fixed DerivateSearchView layout
  • added "disabled" extension point for toggling individual assciations in factual data view

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

changed classpath to 3.5.0

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

latest changes from trunk

• removed unused code

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

• Rights section is now part of MediaSpecimen DetailsView (fixes #4472)
  • DerivedUnits DetailsView only shows FieldUnit data in titleCache (fixes #4474)

• 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

• moved OriginalLabelData section to 2nd position
  • made text field fill horizontally

• fixed possible NPE

• fixed possible SessionException

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