Project

General

Profile

« Previous | Next » 

Revision 52002c73

Added by Cherian Mathew over 9 years ago

merge from trunk

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/PrimerGeneralDetailElement.java
10 10
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
11 11

  
12 12
import eu.etaxonomy.cdm.model.common.DefinedTerm;
13
import eu.etaxonomy.cdm.model.common.TermType;
13 14
import eu.etaxonomy.cdm.model.molecular.Primer;
14 15
import eu.etaxonomy.cdm.model.molecular.SequenceString;
15 16
import eu.etaxonomy.cdm.model.reference.Reference;
......
56 57
    @Override
57 58
    protected void createControls(ICdmFormElement formElement, Primer entity, int style) {
58 59
        textPrimerName = formFactory.createTextWithLabelElement(formElement, "Primer Name", entity.getLabel(), style);
59
        String sequenceString = "";
60
        String sequenceString = null;
60 61
        if(entity.getSequence()!=null){
61 62
            sequenceString = entity.getSequence().getString();
62 63
        }
63 64
        textPrimerSequence = formFactory.createTextWithLabelElement(formElement, "Primer seq. 5'->3'", sequenceString, style);
64 65

  
65
        //TODO dnaMarker
66
//        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
66
        comboMarker = formFactory.createDefinedTermComboElement(TermType.DnaMarker, formElement, "DNA Marker", entity.getDnaMarker(), style);
67 67

  
68 68
        selectionReference = formFactory
69 69
                .createSelectionElement(Reference.class,
......
89 89
            getEntity().setLabel(textPrimerName.getText());
90 90
        }
91 91
        else if(eventSource==comboMarker){
92
            //TODO dnaMarker
93
//            getEntity().setDnaMarker(comboMarker.getSelection());
92
            getEntity().setDnaMarker(comboMarker.getSelection());
94 93
        }
95 94
        else if(eventSource==textPrimerSequence){
96 95
            SequenceString sequenceString = getEntity().getSequence();

Also available in: Unified diff