Merge branch 'develop' into remoting-4.0
authorCherian Mathew <c.mathew@bgbm.org>
Thu, 10 Sep 2015 15:42:26 +0000 (17:42 +0200)
committerCherian Mathew <c.mathew@bgbm.org>
Thu, 10 Sep 2015 15:42:26 +0000 (17:42 +0200)
Conflicts:
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java

1  2 
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientTaxonService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateView.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/CreateDerivateContextMenu.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.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)
@@@ -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;
  
@@@ -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();