Merge branch 'develop' into remoting-4.0

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

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
index 4c4683c29b1c6bfa7effc1fc2a076631f2b87ab1,fac79adfb19e9ea1e0875118ee202a6ebcba5980..fd4154909e3c7574bbba44f2a807e57ac601d21a
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
@@@ -1507,12 -1507,12 +1507,13 @@@ public class TransientTaxonService impl
      }
  
      /* (non-Javadoc)
 -     * @see eu.etaxonomy.cdm.api.service.ITaxonService#changeSynonymToRelatedTaxon(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, eu.etaxonomy.cdm.model.reference.Reference, java.lang.String)
 +     * @see eu.etaxonomy.cdm.api.service.ITaxonService#changeRelatedTaxonToSynonym(java.util.UUID, java.util.UUID, eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType, eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType)
       */
      @Override
 -    public UpdateResult changeSynonymToRelatedTaxon(UUID arg0, UUID arg1, TaxonRelationshipType arg2, Reference arg3,
 -            String arg4) {
 -        return defaultService.changeSynonymToRelatedTaxon(arg0, arg1, arg2, arg3, arg4);
 +    public UpdateResult changeRelatedTaxonToSynonym(UUID arg0, UUID arg1, TaxonRelationshipType arg2,
 +            SynonymRelationshipType arg3) throws DataChangeNoRollbackException {
 +        return defaultService.changeRelatedTaxonToSynonym(arg0, arg1, arg2, arg3);
++
      }
  
      /* (non-Javadoc)

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
index efa20054873e05268870de677b0b7ae37413aa85,d7fcc56f8d710cd59e31b4c7d2f0a926a006b217..8029f92937e9dd9b7637b86508d05fc917243c80
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
@@@ -59,9 -56,12 +60,12 @@@ import eu.etaxonomy.taxeditor.view.deri
   */
  public class DerivateView extends EditorPart implements IPartContentHasFactualData, IDirtyMarkable,
          IConversationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IPartContentHasMedia,
 -        ISelectionChangedListener, IPostOperationEnabled {
 +        ISelectionChangedListener, IPostOperationEnabled , ICdmEntitySessionEnabled {
  
-     public static final String ID = "eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView";
+     public static final String ID = "eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"; //$NON-NLS-1$
+ 
+     public static final String YOU_NEED_TO_SAVE_BEFORE_PERFORMING_THIS_ACTION = Messages.DerivateView_YOU_NEED_TO_SAVE;
+     public static final String VIEW_HAS_UNSAVED_CHANGES = Messages.DerivateView_UNSAVED_CHANGES;
  
        private ConversationHolder conversation;
  

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
index 296a0902adb751da4fc67a80e066917d8e7bd8d9,2438c4325c2bdc03cf9896fc5efd4c08d2d6d8e8..a491a7abfcbab933ae08c9684d0719cbfe129526
--- 1/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
--- 2/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
@@@ -191,10 -194,9 +199,10 @@@ public class CreateDerivateContextMenu 
              if(selectedDerivate instanceof DnaSample && ((DnaSample) selectedDerivate).getRecordBasis()==SpecimenOrObservationType.DnaSample){
                  DnaSample dnaSample = (DnaSample)selectedDerivate;
                  if(childClass.equals(Sequence.class)){
-                     Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0);
+                     Sequence newInstance = Sequence.NewInstance(dnaSample, "", 0); //$NON-NLS-1$
                      createdElement = newInstance;
                  }
 +                CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase) selectedDerivate);
              }
              else if(selectedDerivate instanceof Sequence){
                  SingleRead newInstance = SingleRead.NewInstance();

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
Simple merge

diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
Simple merge