From: Cherian Mathew <c.mathew@bgbm.org>
Date: Tue, 8 Sep 2015 18:49:12 +0000 (+0200)
Subject: Merge branch 'develop' into remoting-4.0
X-Git-Tag: remoting-3.9.0~21
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/9f1df71ff493de7c5c2f9879d9a133dd4e43d997

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
	eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
	eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
---

9f1df71ff493de7c5c2f9879d9a133dd4e43d997
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
index 91d656cb0,4b5d0106a..bd8fca97e
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/dataimport/transientServices/TransientOccurenceService.java
@@@ -1048,4 -1052,6 +1052,5 @@@ public class TransientOccurenceService 
      public UpdateResult moveSequence(UUID arg0, UUID arg1, UUID arg2) {
          return defaultService.moveSequence(arg0, arg1, arg2);
      }
+ 
 -
  }
diff --cc eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
index 11c1af71a,e7bfe694f..9e8f30b5c
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/MoveDerivateOperation.java
@@@ -111,9 -109,7 +111,10 @@@ public class MoveDerivateOperation exte
          else if(draggedNodeValue instanceof SingleRead && targetNodeValue instanceof Sequence){
              SingleRead singleRead = (SingleRead) draggedNodeValue;
              if(fromParentSpecimen instanceof Sequence){
 -                return CdmStore.getService(ISequenceService.class).moveSingleRead((Sequence)fromParentSpecimen, (Sequence)targetNodeValue, singleRead).isOk();
 +                return CdmStore.getService(ISequenceService.class).moveSingleRead(((Sequence)fromParentSpecimen).getUuid(),
 +                        ((Sequence)targetNodeValue).getUuid(),
 +                        singleRead.getUuid()).isOk();
++
              }
          }
  
@@@ -121,9 -117,7 +122,10 @@@
          else if(draggedNodeValue instanceof Sequence && targetNodeValue instanceof DnaSample && ((SpecimenOrObservationBase<?>) targetNodeValue).getRecordBasis()==SpecimenOrObservationType.DnaSample){
              Sequence sequence = (Sequence)draggedNodeValue;
              if(fromParentSpecimen instanceof DnaSample && ((SpecimenOrObservationBase<?>) targetNodeValue).getRecordBasis()==SpecimenOrObservationType.DnaSample){
 -                return occurrenceService.moveSequence((DnaSample)fromParentSpecimen, (DnaSample)targetNodeValue, sequence).isOk();
 +                return occurrenceService.moveSequence(((DnaSample)fromParentSpecimen).getUuid(),
 +                        ((DnaSample)targetNodeValue).getUuid(),
 +                        sequence.getUuid()).isOk();
++
              }
          }
          return false;
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
index c7346c245,93c229adf..6eb54ff1c
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java
@@@ -47,12 -39,8 +47,9 @@@ public class DerivateSearchView extend
          CdmStore.getContextManager().addContextListener(this);
      }
  
-     /* (non-Javadoc)
-      * @see org.eclipse.ui.part.WorkbenchPart#createPartControl(org.eclipse.swt.widgets.Composite)
-      */
      @Override
      public void createPartControl(Composite parent) {
 +
          derivateSearchCompositeController = new DerivateSearchCompositeController(parent, this);
          getSite().setSelectionProvider(derivateSearchCompositeController.getResultViewer());
          derivateSearchCompositeController.setEnabled(CdmStore.isActive());
@@@ -75,14 -60,8 +69,11 @@@
          if(getConversationHolder()!=null && !getConversationHolder().isClosed() && !getConversationHolder().isBound()){
              getConversationHolder().bind();
          }
 +        if(getCdmEntitySession() != null) {
 +            getCdmEntitySession().bind();
 +        }
      }
  
-     /* (non-Javadoc)
-      * @see eu.etaxonomy.taxeditor.model.IContextListener#contextAboutToStop(org.eclipse.ui.IMemento, org.eclipse.core.runtime.IProgressMonitor)
-      */
      @Override
      public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
      }
@@@ -143,37 -100,13 +119,42 @@@
          return conversationHolder;
      }
  
 -    /**
 -     * {@inheritDoc}
 -     */
++
      @Override
      public void dispose() {
+         if(conversationHolder!=null){
+             conversationHolder.close();
+         }
++
 +        cdmEntitySession.dispose();
 +        super.dispose();
 +    }
 +
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getCdmEntitySession()
 +     */
 +    @Override
 +    public ICdmEntitySession getCdmEntitySession() {
 +        initSession();
 +        return cdmEntitySession;
 +    }
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
 +     */
 +    @Override
 +    public <T extends CdmBase> Collection<T> getRootEntities() {
 +        // TODO Auto-generated method stub
 +        return null;
 +    }
 +
 +    /* (non-Javadoc)
 +     * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getPropertyPathsMap()
 +     */
 +    @Override
 +    public Map<Object, List<String>> getPropertyPathsMap() {
 +        // TODO Auto-generated method stub
 +        return null;
      }
  }