- removed obsolete Primer page for AmplificationWizard

 - added dnaMarker to amplification designation

diff --git a/.gitattributes b/.gitattributes
index 5379bc671b84de8761aa8c395a49172c05a28991..279de7dbe6d93d9f16d10054d438a632157b3390 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1291,7 +1291,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/Abst
 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/AmplificationPrimerWizardPage.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
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewClassificationWizard.java -text

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationPrimerWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationPrimerWizardPage.java
deleted file mode 100644 (file)
index a63a0ca..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/AmplificationPrimerWizardPage.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.AmplificationPrimerDetailElement;
-
-/**
- * @author pplitzner
- * @date 11.03.2014
- *
- */
-public class AmplificationPrimerWizardPage extends AbstractCdmEntityWizardPage<Amplification> {
-
-    /**
-     * @param formFactory
-     * @param conversation
-     * @param entity
-     */
-    public AmplificationPrimerWizardPage(CdmFormFactory formFactory,
-            ConversationHolder conversation, Amplification entity) {
-        super(formFactory, conversation, entity);
-        setTitle("Amplification Primer 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) {
-        AmplificationPrimerDetailElement detailElement = formFactory.createAmplificationPrimerDetailElement(rootElement);
-        detailElement.setEntity(getEntity());
-        checkComplete();
-        return detailElement;
-    }
-
-}

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 fb2682fb9a8d71bf186412a5d4decd62ca21490b..fddcbbdc210d8ae245bbf8ba78a6bff3cc2ca1b1 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,7 +21,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplification> {
 
     private AmplificationGeneralWizardPage amplificationGeneralPage;
-    private AmplificationPrimerWizardPage amplificationPrimerPage;
     private AmplificationCloningWizardPage amplificationCloningPage;
     private AmplificationGelPhotoWizardPage amplificationGelPhotoWizardPage;
 
@@ -30,8 +29,6 @@ public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplificati
     public void addPages() {
         amplificationGeneralPage = new AmplificationGeneralWizardPage(formFactory, getConversationHolder(), getEntity());
         addPage(amplificationGeneralPage);
-        amplificationPrimerPage = new AmplificationPrimerWizardPage(formFactory, getConversationHolder(), getEntity());
-        addPage(amplificationPrimerPage);
         amplificationCloningPage = new AmplificationCloningWizardPage(formFactory, getConversationHolder(), getEntity());
         addPage(amplificationCloningPage);
         amplificationGelPhotoWizardPage = new AmplificationGelPhotoWizardPage(formFactory, getConversationHolder(), getEntity());
@@ -55,7 +52,6 @@ public class NewAmplificationWizard  extends AbstractNewEntityWizard<Amplificati
     public void setEntity(Amplification entity) {
         super.setEntity(entity);
         amplificationGeneralPage.getDetailElement().setEntity(entity);
-        amplificationPrimerPage.getDetailElement().setEntity(entity);
         amplificationCloningPage.getDetailElement().setEntity(entity);
         amplificationGelPhotoWizardPage.getDetailElement().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 3aaf5d51a3554ad69a831eac7abd2678c6121da0..aa46c283dbb37fa4309a3650d15aaed8b3a1c581 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
@@ -79,7 +79,10 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
     private void updateDesignationText(){
         String institutionName = "";
         String staffName = "";
+        String dnaMarkerString = "";
         String dateString = "";
+
+        //retrieve data
         //TODO institution
 //        Institution selection = selectionInstitution.getSelection();
 //        if(selection!=null){
@@ -89,10 +92,16 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
         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;
@@ -103,6 +112,12 @@ public class AmplificationGeneralDetailElement extends AbstractCdmDetailElement<
             }
             designation += staffName;
         }
+        if(!dnaMarkerString.equals("")){
+            if(!designation.equals("")){
+                designation += "_";
+            }
+            designation += dnaMarkerString;
+        }
         if(!dateString.equals("")){
             if(!designation.equals("")){
                 designation += "_";

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 57a93c87389dd80ed4dc8fadfe9aa0fefde90ebb..018b6c754f91369740eb6316531a443e740d4415 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
@@ -38,7 +38,6 @@ 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.AmplificationPrimerWizardPage;
 import eu.etaxonomy.taxeditor.newWizard.PrimerWizardPage;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
@@ -145,9 +144,6 @@ public class EditFromSelectionWizard extends Wizard implements
             addPage(new AmplificationGeneralWizardPage(formFactory,
                     selectionElement.getConversationHolder(),
                     (Amplification) entity));
-            addPage(new AmplificationPrimerWizardPage(formFactory,
-                    selectionElement.getConversationHolder(),
-                    (Amplification) entity));
             addPage(new AmplificationCloningWizardPage(formFactory,
                     selectionElement.getConversationHolder(),
                     (Amplification) entity));