- added some more molecular parameters to the DetailsView

[taxeditor.git] / eu.etaxonomy.taxeditor.store / src / main / java / eu / etaxonomy / taxeditor / ui / section / occurrence / dna / PrimerGeneralDetailElement.java

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 b415ef04b0a65718f88ad38e78545eca3dd3c068..da429331e916ea70ce080e7f115b1afefd4d1f19 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
@@ -16,8 +16,10 @@ import eu.etaxonomy.cdm.model.reference.Reference;
 import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
 import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AnnotationSection;
 import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 
 /**
@@ -29,15 +31,11 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
 
 
     private TextWithLabelElement textPrimerName;
-    //TODO we are using a basic text field which is backed up by a Sequence object modelwise.
+    // we are using a basic text field which is backed up by a Sequence object modelwise.
     // This is a bit of a overhead as we may just need the sequence string. This may change in future in both directions:
     // either extending this view to support the remaining fields of Sequence or by switching to the more basic SequenceString model element
     private TextWithLabelElement textPrimerSequence;
     private TermComboElement<DefinedTerm> comboMarker;
-    /**
-     * free text notes field is backed up by an annotation
-     */
-    private TextWithLabelElement textNotes;
     private EntitySelectionElement<Reference> selectionReference;
 
     /**
@@ -63,14 +61,19 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
             sequenceString = entity.getSequence().getString();
         }
         textPrimerSequence = formFactory.createTextWithLabelElement(formElement, "Primer seq. 5'->3'", sequenceString, style);
-        //TODO: marker
-        //TODO: notes
+
+        //TODO dnaMarker
+//        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
 
         selectionReference = formFactory
                 .createSelectionElement(Reference.class,
                         getConversationHolder(), formElement, "Reference",
                         entity.getPublishedIn(),
                         EntitySelectionElement.ALL, style);
+
+        AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
+        annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+        annotationSection.setEntity(entity);
     }
 
     /*
@@ -85,6 +88,10 @@ public class PrimerGeneralDetailElement extends AbstractCdmDetailElement<Primer>
         if(eventSource==textPrimerName){
             getEntity().setLabel(textPrimerName.getText());
         }
+        else if(eventSource==comboMarker){
+            //TODO dnaMarker
+//            getEntity().setDnaMarker(comboMarker.getSelection());
+        }
         else if(eventSource==textPrimerSequence){
             SequenceString sequenceString = getEntity().getSequence();
             if(sequenceString==null){