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/SingleReadGeneralDetailElement.java
10 10
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
11 11

  
12 12
import eu.etaxonomy.cdm.model.molecular.Amplification;
13
import eu.etaxonomy.cdm.model.molecular.AmplificationResult;
13 14
import eu.etaxonomy.cdm.model.molecular.Primer;
14 15
import eu.etaxonomy.cdm.model.molecular.SingleRead;
15 16
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
......
47 48
    @Override
48 49
    protected void createControls(ICdmFormElement formElement, SingleRead entity, int style) {
49 50
        selectionPrimer = formFactory.createSelectionElement(Primer.class, getConversationHolder(), formElement, "Primer", entity.getPrimer(), EntitySelectionElement.ALL, style);
50
        selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", entity.getAmplification(), EntitySelectionElement.ALL, style);
51
        AmplificationResult amplificationResult = entity.getAmplificationResult();
52
        if(amplificationResult==null){
53
            amplificationResult = AmplificationResult.NewInstance();
54
            amplificationResult.addSingleRead(entity);
55
        }
56
        selectionAmplification = formFactory.createSelectionElement(Amplification.class, getConversationHolder(), formElement, "Amplification", amplificationResult.getAmplification(), EntitySelectionElement.ALL, style);
51 57

  
52 58
        AnnotationSection annotationSection = formFactory.createAnnotationSection(getConversationHolder(), formElement, style);
53 59
        annotationSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
54 60
        annotationSection.setEntity(entity);
61

  
62
        AmplificationCloningDetailSection cloningSection = formFactory.createAmplificationCloningDetailSection(getConversationHolder(), formElement, formFactory.getSelectionProvider(), style);
63
        cloningSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
64
        cloningSection.setEntity(amplificationResult);
65

  
66
        AmplificationGelPhotoCollectionDetailSection gelPhotoSection = formFactory.createAmplificationGelPhotoCollectionDetailSection(getConversationHolder(), formElement, style);
67
        gelPhotoSection.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
68
        gelPhotoSection.setEntity(amplificationResult);
55 69
    }
56 70

  
57 71
    /*
......
66 80
        if(eventSource==selectionPrimer){
67 81
            getEntity().setPrimer(selectionPrimer.getSelection());
68 82
        }
69
        else if(eventSource==selectionAmplification){
70
            selectionAmplification.getSelection().addSingleRead(getEntity());
83
        else {
84
            if(eventSource==selectionAmplification){
85
                AmplificationResult amplificationResult = getEntity().getAmplificationResult();
86
                if(amplificationResult==null){
87
                    amplificationResult = AmplificationResult.NewInstance();
88
                }
89
                amplificationResult.setAmplification(selectionAmplification.getSelection());
90
                amplificationResult.addSingleRead(getEntity());
91
            }
71 92
        }
72 93
    }
73 94
}

Also available in: Unified diff