- adapted details views and wizards to cdm changes (amplifaction + amplification...

 - added missing parameters to details views

diff --git a/.gitattributes b/.gitattributes
index 69b4e54cd9af2d5e10ad64ca1f94d5de2027ed31..c6f7c06924c4ef6c3c246f561d6e86fe23ef06f9 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1298,8 +1298,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTra
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TextHelper.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TimeHelper.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AbstractNewEntityWizard.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationCloningWizardPage.java -text
-eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGelPhotoWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/ExternalReferenceServiceWizardPage.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java -text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationCloningWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationCloningWizardPage.java
deleted file mode 100644 (file)
index 02c1d12..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationCloningWizardPage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-/**
- * Copyright (C) 2014 EDIT
- * European Distributed Institute of Taxonomy
- * http://www.e-taxonomy.eu
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1
- * See LICENSE.TXT at the top of this package for the full license terms.
- */
-package eu.etaxonomy.taxeditor.newWizard;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationCloningDetailElement;
-
-/**
- * @author pplitzner
- * @date 11.03.2014
- *
- */
-public class AmplificationCloningWizardPage extends AbstractCdmEntityWizardPage<Amplification> {
-
-    /**
-     * @param formFactory
-     * @param conversation
-     * @param entity
-     */
-    public AmplificationCloningWizardPage(CdmFormFactory formFactory,
-            ConversationHolder conversation, Amplification entity) {
-        super(formFactory, conversation, entity);
-        setTitle("Amplification Cloning Data");
-    }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete()
-     */
-    @Override
-    protected void checkComplete() {
-        setPageComplete(true);
-    }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
-     */
-    @Override
-    public AbstractCdmDetailElement<Amplification> createElement(ICdmFormElement rootElement) {
-        AmplificationCloningDetailElement detailElement = formFactory.createAmplificationCloningDetailElement(rootElement);
-        detailElement.setEntity(getEntity());
-        checkComplete();
-        return detailElement;
-    }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGelPhotoWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGelPhotoWizardPage.java
deleted file mode 100644 (file)
index 1fc4ecd..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGelPhotoWizardPage.java
+++ /dev/null
@@ -1,57 +0,0 @@
-// $Id$
-/**
- * Copyright (C) 2014 EDIT
- * European Distributed Institute of Taxonomy
- * http://www.e-taxonomy.eu
- *
- * The contents of this file are subject to the Mozilla Public License Version 1.1
- * See LICENSE.TXT at the top of this package for the full license terms.
- */
-package eu.etaxonomy.taxeditor.newWizard;
-
-import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
-import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
-import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGelPhotoDetailElement;
-
-/**
- * @author pplitzner
- * @date 11.03.2014
- *
- */
-public class AmplificationGelPhotoWizardPage extends AbstractCdmEntityWizardPage<Amplification> {
-
-    /**
-     * @param formFactory
-     * @param conversation
-     * @param entity
-     */
-    public AmplificationGelPhotoWizardPage(CdmFormFactory formFactory,
-            ConversationHolder conversation, Amplification entity) {
-        super(formFactory, conversation, entity);
-        setTitle("Amplification Gel Photo");
-    }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.forms.AbstractCdmEntityWizardPage#checkComplete()
-     */
-    @Override
-    protected void checkComplete() {
-        setPageComplete(true);
-    }
-
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
-     */
-    @Override
-    public AbstractCdmDetailElement<Amplification> createElement(ICdmFormElement rootElement) {
-        AmplificationGelPhotoDetailElement detailElement = formFactory.createAmplificationGelPhotoDetailElement(rootElement);
-        detailElement.setEntity(getEntity());
-        checkComplete();
-        return detailElement;
-    }
-
-}

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java
index df056f0470effa320303c8f0381eb188303e53a9..7457bb76d8172a2c1f3a4e7645ac5785186a0913 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationGeneralWizardPage.java
@@ -11,13 +11,11 @@ package eu.etaxonomy.taxeditor.newWizard;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
-import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGeneralDetailElement;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.PrimerGeneralDetailElement;
 
 /**
  * @author pplitzner
@@ -42,6 +40,8 @@ public class AmplificationGeneralWizardPage extends AbstractCdmEntityWizardPage<
      */
     @Override
     protected void checkComplete() {
+        //TODO: check for institution, staff and date
+        //one of them has to be set otherwise setPageComplete(false);
         setPageComplete(true);
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
index fddcbbdc210d8ae245bbf8ba78a6bff3cc2ca1b1..e9f2eef6a52108b91be1330c83c9d92e2de35e4a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewAmplificationWizard.java
@@ -21,18 +21,12 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplification> {
 
     private AmplificationGeneralWizardPage amplificationGeneralPage;
-    private AmplificationCloningWizardPage amplificationCloningPage;
-    private AmplificationGelPhotoWizardPage amplificationGelPhotoWizardPage;
 
     /** {@inheritDoc} */
     @Override
     public void addPages() {
         amplificationGeneralPage = new AmplificationGeneralWizardPage(formFactory, getConversationHolder(), getEntity());
         addPage(amplificationGeneralPage);
-        amplificationCloningPage = new AmplificationCloningWizardPage(formFactory, getConversationHolder(), getEntity());
-        addPage(amplificationCloningPage);
-        amplificationGelPhotoWizardPage = new AmplificationGelPhotoWizardPage(formFactory, getConversationHolder(), getEntity());
-        addPage(amplificationGelPhotoWizardPage);
     }
 
     /** {@inheritDoc} */
@@ -52,8 +46,6 @@ public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplificati
     public void setEntity(Amplification entity) {
         super.setEntity(entity);
         amplificationGeneralPage.getDetailElement().setEntity(entity);
-        amplificationCloningPage.getDetailElement().setEntity(entity);
-        amplificationGelPhotoWizardPage.getDetailElement().setEntity(entity);
     }
 
     @Override

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
index f2e1cd211d05ddd31629b5080c7d124d83d71416..8f8af98791929443405592973c49f9abf6f608d0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AmplificationSelectionDialog.java
@@ -70,7 +70,7 @@ AbstractFilteredCdmResourceSelectionDialog<Amplification> {
     @Override
     protected String getTitle(Amplification cdmObject) {
         if(cdmObject!=null){
-            return cdmObject.getDescription();
+            return cdmObject.getLabelCache();
         }
         return super.getTitle(cdmObject);
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
index da80ca6040a678da7b0c68e43a7ea5662bd8f17b..f44bccdb3d5fb2ba5c2ae907ef9e6ed4ddfc34bf 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailElement.java
@@ -11,7 +11,9 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.common.TermType;
+import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
+import eu.etaxonomy.cdm.model.molecular.Cloning;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
@@ -25,7 +27,7 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @date 15.01.2014
  *
  */
-public class AmplificationCloningDetailElement  extends AbstractCdmDetailElement<Amplification> {
+public class AmplificationCloningDetailElement extends AbstractCdmDetailElement<AmplificationResult> {
     private TextWithLabelElement textCloningStrain;
     private TimePeriodElement date;
     private EntitySelectionElement<AgentBase> selectionCloningStaff;
@@ -48,12 +50,12 @@ public class AmplificationCloningDetailElement  extends AbstractCdmDetailElement
      * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
      */
     @Override
-    protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
-//        Cloning cloning = entity.getCloning();
-//        textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style);
-//        date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style);
-//        selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
-//        comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
+    protected void createControls(ICdmFormElement formElement, AmplificationResult entity, int style) {
+        Cloning cloning = entity.getCloning();
+        textCloningStrain = formFactory.createTextWithLabelElement(formElement, "Cloning Strain", cloning==null?"":cloning.getStrain(), style);
+        date = formFactory.createTimePeriodElement(formElement, "Cloning Date", cloning==null?null:cloning.getTimeperiod(), style);
+        selectionCloningStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Cloning Staff", cloning==null?null:cloning.getActor(), EntitySelectionElement.ALL, style);
+        comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
     }
 
     /*
@@ -65,25 +67,25 @@ public class AmplificationCloningDetailElement  extends AbstractCdmDetailElement
      */
     @Override
     public void handleEvent(Object eventSource) {
-//        if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){
-//            Cloning cloning = getEntity().getCloning();
-//            if(cloning==null){
-//                cloning = Cloning.NewInstance();
-//                getEntity().setCloning(cloning);
-//            }
-//            if(eventSource==textCloningStrain){
-//                cloning.setStrain(textCloningStrain.getText());
-//            }
-//            else if(eventSource==date){
-//                cloning.setTimeperiod(date.getTimePeriod());
-//            }
-//            else if(eventSource==selectionCloningStaff){
-//                cloning.setActor(selectionCloningStaff.getSelection());
-//            }
-//            else if(eventSource==comboCloningMaterialOrMethod){
-//                cloning.setDefinedMaterialOrMethod(comboCloningMaterialOrMethod.getSelection());
-//            }
-//        }
+        if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){
+            Cloning cloning = getEntity().getCloning();
+            if(cloning==null){
+                cloning = Cloning.NewInstance();
+                getEntity().setCloning(cloning);
+            }
+            if(eventSource==textCloningStrain){
+                cloning.setStrain(textCloningStrain.getText());
+            }
+            else if(eventSource==date){
+                cloning.setTimeperiod(date.getTimePeriod());
+            }
+            else if(eventSource==selectionCloningStaff){
+                cloning.setActor(selectionCloningStaff.getSelection());
+            }
+            else if(eventSource==comboCloningMaterialOrMethod){
+                cloning.setDefinedMaterialOrMethod(comboCloningMaterialOrMethod.getSelection());
+            }
+        }
     }
 
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailSection.java
index b4b2066a5b6d49edcce813136785f5f764517c4f..0de960b8a518fce45964a743d967dd17779719cc 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationCloningDetailSection.java
@@ -12,7 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 import org.eclipse.jface.viewers.ISelectionProvider;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
@@ -23,7 +23,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
  * @date 15.01.2014
  *
  */
-public class AmplificationCloningDetailSection extends AbstractCdmDetailSection<Amplification> {
+public class AmplificationCloningDetailSection extends AbstractCdmDetailSection<AmplificationResult> {
 
     /**
      * @param formFactory
@@ -51,7 +51,7 @@ public class AmplificationCloningDetailSection extends AbstractCdmDetailSection<
      * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
      */
     @Override
-    protected AbstractCdmDetailElement<Amplification> createCdmDetailElement(AbstractCdmDetailSection<Amplification> parentElement, int style) {
+    protected AbstractCdmDetailElement<AmplificationResult> createCdmDetailElement(AbstractCdmDetailSection<AmplificationResult> parentElement, int style) {
         return formFactory.createAmplificationCloningDetailElement(parentElement);
     }
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java
index e982e7ff2edb5aa93376ab3e1b02b0ade4b53cbb..7bf2e9f5519fe5a3da3250bfa134eaace0e8052a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoCollectionDetailSection.java
@@ -14,7 +14,7 @@ import java.util.Collections;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
@@ -24,7 +24,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
  * @date 26.02.2014
  *
  */
-public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntityCollectionSection<Amplification, Media> {
+public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntityCollectionSection<AmplificationResult, Media> {
 
     /**
      * @param formFactory
@@ -44,10 +44,10 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection#getCollection(java.lang.Object)
      */
     @Override
-    public Collection<Media> getCollection(Amplification entity) {
-//        if(entity.getGelPhoto()!=null){
-//            return Collections.singleton(entity.getGelPhoto());
-//        }
+    public Collection<Media> getCollection(AmplificationResult entity) {
+        if(entity.getGelPhoto()!=null){
+            return Collections.singleton(entity.getGelPhoto());
+        }
         return Collections.EMPTY_LIST;
     }
 
@@ -56,9 +56,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public Media createNewElement() {
-//        if(getEntity().getGelPhoto()==null){
-//            return Media.NewInstance();
-//        }
+        if(getEntity().getGelPhoto()==null){
+            return Media.NewInstance();
+        }
         return null;
     }
 
@@ -67,9 +67,9 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public void addElement(Media element) {
-//        if(getEntity().getGelPhoto()==null){
-//            getEntity().setGelPhoto(element);
-//        }
+        if(getEntity().getGelPhoto()==null){
+            getEntity().setGelPhoto(element);
+        }
 
     }
 
@@ -78,7 +78,7 @@ public class AmplificationGelPhotoCollectionDetailSection extends AbstractEntity
      */
     @Override
     public void removeElement(Media element) {
-//        getEntity().setGelPhoto(null);
+        getEntity().setGelPhoto(null);
     }
 
     /* (non-Javadoc)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoDetailElement.java
index 8c0b4559e6d7bca98baf6d15a5f0c69e07da5ce3..b6c96c8e1d80d4f0c47ba2606f92a0226caa98c1 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGelPhotoDetailElement.java
@@ -9,7 +9,7 @@
 */
 package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
-import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
@@ -20,7 +20,7 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
  * @date 15.01.2014
  *
  */
-public class AmplificationGelPhotoDetailElement  extends AbstractCdmDetailElement<Amplification> {
+public class AmplificationGelPhotoDetailElement  extends AbstractCdmDetailElement<AmplificationResult> {
     private AmplificationGelPhotoCollectionDetailSection sectionGelPhoto;
 
     /**
@@ -39,7 +39,7 @@ public class AmplificationGelPhotoDetailElement  extends AbstractCdmDetailElemen
      * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
      */
     @Override
-    protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
+    protected void createControls(ICdmFormElement formElement, AmplificationResult entity, int style) {
         sectionGelPhoto = formFactory.createAmplificationGelPhotoCollectionDetailSection(getConversationHolder(), formElement, style);
         sectionGelPhoto.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
         sectionGelPhoto.setEntity(entity);

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
index c4ee24e2102497fd9e8161b4bc63369cfeba60ca..c9931bae3b30edc2e36ebf340774229cbae55e8f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AmplificationGeneralDetailElement.java
@@ -13,7 +13,6 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
@@ -59,10 +58,9 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
      */
     @Override
     protected void createControls(ICdmFormElement formElement, Amplification entity, int style) {
-        textDesignation = formFactory.createTextWithLabelElement(formElement, "Designation", entity.getDescription(), style);
+        textDesignation = formFactory.createTextWithLabelElement(formElement, "Designation", entity.getLabelCache(), style);
         textDesignation.setEnabled(false);
-        //TODO institution
-//        selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", entity.getInstitution(), EntitySelectionElement.ALL, style);
+        selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", entity.getInstitution(), EntitySelectionElement.ALL, style);
         selectionAmplificationStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Amplification staff", entity.getActor(), EntitySelectionElement.ALL, style);
         dateAmplification = formFactory.createTimePeriodElement(formElement, "Date", entity.getTimeperiod(), style);
         comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
@@ -72,60 +70,6 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
         AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
         annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
         annotationSection.setEntity(entity);
-
-        updateDesignationText();
-    }
-
-    private void updateDesignationText(){
-        String institutionName = "";
-        String staffName = "";
-        String dnaMarkerString = "";
-        String dateString = "";
-
-        //retrieve data
-        //TODO institution
-//        Institution selection = selectionInstitution.getSelection();
-//        if(selection!=null){
-//            institutionName = selection.getName();
-//        }
-        AgentBase staff = selectionAmplificationStaff.getSelection();
-        if(staff!=null){
-            staffName = staff.getTitleCache();
-        }
-        DefinedTerm dnaMarker = comboMarker.getSelection();
-        if(dnaMarker!=null){
-            dnaMarkerString = dnaMarker.generateTitle();
-        }
-        TimePeriod timePeriod = dateAmplification.getTimePeriod();
-        if(timePeriod!=null){
-            dateString = timePeriod.toString()!=null?timePeriod.toString():"";
-        }
-
-        //assemble string
-        String designation = "";
-        if(!institutionName.equals("")){
-            designation += institutionName;
-        }
-        if(!staffName.equals("")){
-            if(!designation.equals("")){
-                designation += "_";
-            }
-            designation += staffName;
-        }
-        if(!dnaMarkerString.equals("")){
-            if(!designation.equals("")){
-                designation += "_";
-            }
-            designation += dnaMarkerString;
-        }
-        if(!dateString.equals("")){
-            if(!designation.equals("")){
-                designation += "_";
-            }
-            designation += dateString;
-        }
-        textDesignation.setText(designation);
-        getEntity().setDescription(designation);
     }
 
     /*
@@ -142,20 +86,15 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
         }
         else if(eventSource==comboMarker){
             getEntity().setDnaMarker(comboMarker.getSelection());
-            updateDesignationText();
         }
         else if(eventSource==dateAmplification){
             getEntity().setTimeperiod(dateAmplification.getTimePeriod());
-            updateDesignationText();
         }
         else if(eventSource==selectionAmplificationStaff){
             getEntity().setActor(selectionAmplificationStaff.getEntity());
-            updateDesignationText();
         }
         else if(eventSource==selectionInstitution){
-            //TODO institution
-//            getEntity().setInstitution(selectionInstitution.getSelection());
-            updateDesignationText();
+            getEntity().setInstitution(selectionInstitution.getSelection());
         }
         else if(eventSource==selectionPrimerFW){
             getEntity().setForwardPrimer(selectionPrimerFW.getSelection());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
index 0ffa61703b0399d271ee205d7c82493904e813d9..2cbf45f6bee259a6eac4a1096ad76c94a78d630d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/DnaSampleGeneralDetailElement.java
@@ -35,7 +35,7 @@ public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaS
 
     private EntitySelectionElement<Institution> selectionInstitution;
     private EntitySelectionElement<AgentBase> selectionStaff;
-    private TimePeriodElement datePreservationDate;
+    private TimePeriodElement datePreparationDate;
     private NumberWithLabelElement numberPreservationTemperature;
     private TermComboElement<DefinedTerm> comboMaterialOrMethods;
     private TextWithLabelElement textBarcode;
@@ -62,7 +62,7 @@ public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaS
         AgentBase<?> staff = null;
         TimePeriod preparationDate = null;
         if(entity.getDerivedFrom()!=null){
-//            institution = entity.getDerivedFrom().getInstitution();
+            institution = entity.getDerivedFrom().getInstitution();
             staff = entity.getDerivedFrom().getActor();
             preparationDate = entity.getDerivedFrom().getTimeperiod();
         }
@@ -73,10 +73,9 @@ public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaS
             temperature = entity.getPreservation().getTemperature();
             definedMaterialOrMethod = entity.getPreservation().getDefinedMaterialOrMethod();
         }
-        //TODO institution
-//        selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", staff, EntitySelectionElement.ALL, style);
+        selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", institution, EntitySelectionElement.ALL, style);
         selectionStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Staff", staff, EntitySelectionElement.ALL, style);
-        datePreservationDate = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
+        datePreparationDate = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
         numberPreservationTemperature = formFactory.createNumberTextWithLabelElement(formElement, "Preservation Temp. [C°]", temperature, style);
         comboMaterialOrMethods = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Materials & Methods", definedMaterialOrMethod, style);
         textBarcode = formFactory.createTextWithLabelElement(formElement, "Barcode", entity.getBarcode(), style);
@@ -93,11 +92,20 @@ public class DnaSampleGeneralDetailElement extends AbstractCdmDetailElement<DnaS
      */
     @Override
     public void handleEvent(Object eventSource) {
-        if(eventSource==datePreservationDate){
-            addPreservationMethod().setTimeperiod(datePreservationDate.getTimePeriod());
+        if(eventSource==datePreparationDate){
+            if(getEntity().getDerivedFrom()!=null){
+                getEntity().getDerivedFrom().setTimeperiod(datePreparationDate.getTimePeriod());
+            }
+        }
+        else if(eventSource==selectionInstitution){
+            if(getEntity().getDerivedFrom()!=null){
+                getEntity().getDerivedFrom().setInstitution(selectionInstitution.getSelection());
+            }
         }
         else if(eventSource==selectionStaff){
-            addPreservationMethod().setActor(selectionStaff.getSelection());
+            if(getEntity().getDerivedFrom()!=null){
+                getEntity().getDerivedFrom().setActor(selectionStaff.getSelection());
+            }
         }
         else if(eventSource==numberPreservationTemperature){
             addPreservationMethod().setTemperature(numberPreservationTemperature.getDouble());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
index da429331e916ea70ce080e7f115b1afefd4d1f19..4a997e34266614adf0e54fba1c2d36ee21707796 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
+import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.cdm.model.molecular.SequenceString;
 import eu.etaxonomy.cdm.model.reference.Reference;
@@ -56,14 +57,13 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
     @Override
     protected void createControls(ICdmFormElement formElement, Primer entity, int style) {
         textPrimerName = formFactory.createTextWithLabelElement(formElement, "Primer Name", entity.getLabel(), style);
-        String sequenceString = "";
+        String sequenceString = null;
         if(entity.getSequence()!=null){
             sequenceString = entity.getSequence().getString();
         }
         textPrimerSequence = formFactory.createTextWithLabelElement(formElement, "Primer seq. 5'->3'", sequenceString, style);
 
-        //TODO dnaMarker
-//        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
+        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
 
         selectionReference = formFactory
                 .createSelectionElement(Reference.class,
@@ -89,8 +89,7 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
             getEntity().setLabel(textPrimerName.getText());
         }
         else if(eventSource==comboMarker){
-            //TODO dnaMarker
-//            getEntity().setDnaMarker(comboMarker.getSelection());
+            getEntity().setDnaMarker(comboMarker.getSelection());
         }
         else if(eventSource==textPrimerSequence){
             SequenceString sequenceString = getEntity().getSequence();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
index 0c2f933e8d92afc021cb6d57d81ee9bbaf237b97..02cff91ee52fbb1f580bb0836d2aa9e1ab81b4ce 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/SingleReadGeneralDetailElement.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 
 import eu.etaxonomy.cdm.model.molecular.Amplification;
+import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
 import eu.etaxonomy.cdm.model.molecular.Primer;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -47,11 +48,24 @@ public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement<Sin
     @Override
     protected void createControls(ICdmFormElement formElement, SingleRead entity, int style) {
         selectionPrimer = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer", entity.getPrimer(), EntitySelectionElement.ALL, style);
-//        selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", entity.getAmplification(), EntitySelectionElement.ALL, style);
+        AmplificationResult amplificationResult = entity.getAmplificationResult();
+        if(amplificationResult==null){
+            amplificationResult = AmplificationResult.NewInstance();
+            amplificationResult.addSingleRead(entity);
+        }
+        selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", amplificationResult.getAmplification(), EntitySelectionElement.ALL, style);
 
         AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
         annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
         annotationSection.setEntity(entity);
+
+        AmplificationCloningDetailSection cloningSection = formFactory.createAmplificationCloningDetailSection(getConversationHolder(), formElement, formFactory.getSelectionProvider(), style);
+        cloningSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+        cloningSection.setEntity(amplificationResult);
+
+        AmplificationGelPhotoCollectionDetailSection gelPhotoSection = formFactory.createAmplificationGelPhotoCollectionDetailSection(getConversationHolder(), formElement, style);
+        gelPhotoSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+        gelPhotoSection.setEntity(amplificationResult);
     }
 
     /*
@@ -66,8 +80,15 @@ public class SingleReadGeneralDetailElement extends AbstractCdmDetailElement<Sin
         if(eventSource==selectionPrimer){
             getEntity().setPrimer(selectionPrimer.getSelection());
         }
-        else if(eventSource==selectionAmplification){
-//            selectionAmplification.getSelection().addSingleRead(getEntity());
+        else {
+            if(eventSource==selectionAmplification){
+                AmplificationResult amplificationResult = getEntity().getAmplificationResult();
+                if(amplificationResult==null){
+                    amplificationResult = AmplificationResult.NewInstance();
+                }
+                amplificationResult.setAmplification(selectionAmplification.getSelection());
+                amplificationResult.addSingleRead(getEntity());
+            }
         }
     }
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
index 5cb1e2bc1ec656b35ae27ee218214e0a64d07146..59721c32fc63b65f2bac44a74a674f3359936dea 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/TissueSampleGeneralDetailElement.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
 import org.apache.log4j.Logger;
 
 import eu.etaxonomy.cdm.model.agent.AgentBase;
+import eu.etaxonomy.cdm.model.agent.Institution;
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
@@ -37,7 +38,7 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
     static private final Logger logger = Logger.getLogger(TissueSampleGeneralDetailElement.class);
 
     private TermComboElement<DefinedTerm> comboKindOfTissue;
-    private EntitySelectionElement<AgentBase> selectionInstitution;
+    private EntitySelectionElement<Institution> selectionInstitution;
     private EntitySelectionElement<AgentBase> selectionStaff;
     private TimePeriodElement datePreparation;
     private TermComboElement<DefinedTerm> comboPreservationMedium;
@@ -64,19 +65,20 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
      */
     @Override
     protected void createControls(ICdmFormElement formElement, DnaSample entity, int style) {
-        //TODO handle all parameters here and in handleEvent()
         comboKindOfTissue = formFactory.createDefinedTermComboElement(TermType.KindOfUnit, formElement, "Kind Of Tissue", entity.getKindOfUnit(), style);
-        //TODO: institute
         TimePeriod preparationDate = null;
         DefinedTerm preservationMedium = null;
         AgentBase<?> staff = null;
+        Institution institution = null;
         if(entity.getDerivedFrom()!=null){
             staff = entity.getDerivedFrom().getActor();
             preparationDate = entity.getDerivedFrom().getTimeperiod();
+            institution = entity.getDerivedFrom().getInstitution();
         }
         if(entity.getPreservation()!=null){
             preservationMedium = entity.getPreservation().getMedium();
         }
+        selectionInstitution = formFactory.createSelectionElement(Institution.class, getConversationHolder(), formElement, "Institution", institution, EntitySelectionElement.ALL, style);
         selectionStaff = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Staff", staff, EntitySelectionElement.ALL,style);
         datePreparation = formFactory.createTimePeriodElement(formElement, "Preparation date", preparationDate, style);
         comboPreservationMedium = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation medium", preservationMedium, style);
@@ -96,7 +98,6 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
      */
     @Override
     public void handleEvent(Object eventSource) {
-        //TODO: institute
         if(eventSource==comboKindOfTissue) {
             getEntity().setKindOfUnit(comboKindOfTissue.getSelection());
         }
@@ -117,6 +118,11 @@ public class TissueSampleGeneralDetailElement extends AbstractCdmDetailElement<D
                 getEntity().getDerivedFrom().setTimeperiod(datePreparation.getTimePeriod());
             }
         }
+        else if(eventSource==selectionInstitution){
+            if(getEntity().getDerivedFrom()!=null){
+                getEntity().getDerivedFrom().setInstitution(selectionInstitution.getSelection());
+            }
+        }
         else if(eventSource==selectionStaff){
             if(getEntity().getDerivedFrom()!=null){
                 getEntity().getDerivedFrom().setActor(selectionStaff.getSelection());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
index 018b6c754f91369740eb6316531a443e740d4415..a9175681804242fd4de0d0f0ebc5b5ffc80ca804 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EditFromSelectionWizard.java
@@ -35,8 +35,6 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.model.TextHelper;
-import eu.etaxonomy.taxeditor.newWizard.AmplificationCloningWizardPage;
-import eu.etaxonomy.taxeditor.newWizard.AmplificationGelPhotoWizardPage;
 import eu.etaxonomy.taxeditor.newWizard.AmplificationGeneralWizardPage;
 import eu.etaxonomy.taxeditor.newWizard.PrimerWizardPage;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -144,12 +142,6 @@ public class EditFromSelectionWizard extends Wizard implements
             addPage(new AmplificationGeneralWizardPage(formFactory,
                     selectionElement.getConversationHolder(),
                     (Amplification) entity));
-            addPage(new AmplificationCloningWizardPage(formFactory,
-                    selectionElement.getConversationHolder(),
-                    (Amplification) entity));
-            addPage(new AmplificationGelPhotoWizardPage(formFactory,
-                    selectionElement.getConversationHolder(),
-                    (Amplification) entity));
         } else {
                        MessagingUtils.warningDialog("Missing interface", this,
                                        "No detail element for current selection");

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
index 5867eff5238b6daca436394bd777c3db962bf9b8..7cb308c7da84be0cd97811004c592dabb3eff473 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java
@@ -269,9 +269,9 @@ public class DerivateLabelProvider extends ColumnLabelProvider {
                 if(sequence!=null && sequence.getDnaMarker()!=null){
                     label += sequence.getDnaMarker()+separator;
                 }
-//                if(singleRead.getAmplification()!=null && singleRead.getAmplification().getDescription()!=null){
-//                    label += singleRead.getAmplification().getDescription()+separator;
-//                }
+                if(singleRead.getAmplificationResult()!=null && singleRead.getAmplificationResult().getAmplification()!=null){
+                    label += singleRead.getAmplificationResult().getAmplification().getLabelCache()+separator;
+                }
             }
         }
         //SOOB

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
index 9592c1032cbdecf04f4abf011a91d337f56942dc..f8950d456bd55fc2905bb272dc4440ed738b7e90 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java
@@ -39,7 +39,6 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
 import eu.etaxonomy.cdm.model.description.SpecimenDescription;
 import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.molecular.Amplification;
 import eu.etaxonomy.cdm.model.molecular.DnaSample;
 import eu.etaxonomy.cdm.model.molecular.Sequence;
 import eu.etaxonomy.cdm.model.molecular.SingleRead;
@@ -96,10 +95,6 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.FieldUnitGeneralDetailSectio
 import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.OriginalLabelDataSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.association.TaxonAssociationDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationCloningDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGelPhotoCollectionDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGeneralDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationPrimerDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaQualityDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaSampleGeneralDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SampleDesignationDetailSection;
@@ -245,7 +240,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                 createSpecimenDescriptionSection(rootElement);
             }
             else{
-                Set<Marker> descriptionMarkers = ((DescriptionBase) input).getMarkers();
+                Set<Marker> descriptionMarkers = ((DescriptionBase<?>) input).getMarkers();
                 MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(
                         UsageTermCollection.uuidUseMarkerType);
                 Boolean isUseDescription = false;
@@ -254,7 +249,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
                         isUseDescription = true;
                     }
                 }
-                if (((DescriptionBase) input).isImageGallery()) {
+                if (((DescriptionBase<?>) input).isImageGallery()) {
                     createImageGallerySection(rootElement);
 
                 } else if (isUseDescription) {
@@ -320,9 +315,6 @@ public class DetailsViewer extends AbstractCdmDataViewer {
         } else if (input instanceof MediaSpecimen){
             createMediaSpecimenSection(rootElement);
         }
-        else if(input instanceof Amplification){
-            createAmplificationSection(rootElement);
-        }
         else if(input instanceof Sequence){
             createSequenceSection(rootElement);
         }
@@ -765,29 +757,6 @@ public class DetailsViewer extends AbstractCdmDataViewer {
         addPart(sampleDesignationDetailSection);
     }
 
-    private void createAmplificationSection(RootElement parent) {
-        destroySections();
-        AmplificationGeneralDetailSection generalSection = formFactory.createAmplificationGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
-        AmplificationPrimerDetailSection primerSection = formFactory.createAmplificationPrimerDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
-        AmplificationCloningDetailSection cloningSection = formFactory.createAmplificationCloningDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-
-        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
-
-        AmplificationGelPhotoCollectionDetailSection gelPhotoSection = formFactory.createAmplificationGelPhotoCollectionDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-
-
-        addPart(generalSection);
-        addPart(primerSection);
-        addPart(cloningSection);
-        addPart(gelPhotoSection);
-    }
-
     private void createSequenceSection(RootElement parent) {
         destroySections();
 
@@ -811,13 +780,13 @@ public class DetailsViewer extends AbstractCdmDataViewer {
         destroySections();
 
         SingleReadGeneralDetailSection section = formFactory.createSingleReadGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
+        addPart(section);
 
         formFactory.createHorizontalSeparator(parent, SWT.BORDER);
 
         SingleReadPherogramCollectionDetailSection pherogramSection = formFactory.createSingleReadPherogramCollectionDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
-
-        addPart(section);
         addPart(pherogramSection);
+
     }
 
     private void createMediaSpecimenSection(RootElement parent) {