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/view/detail/DetailsViewer.java
39 39
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
40 40
import eu.etaxonomy.cdm.model.description.SpecimenDescription;
41 41
import eu.etaxonomy.cdm.model.media.Media;
42
import eu.etaxonomy.cdm.model.molecular.Amplification;
43 42
import eu.etaxonomy.cdm.model.molecular.DnaSample;
44 43
import eu.etaxonomy.cdm.model.molecular.Sequence;
45 44
import eu.etaxonomy.cdm.model.molecular.SingleRead;
......
55 54
import eu.etaxonomy.taxeditor.model.AbstractUtility;
56 55
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
57 56
import eu.etaxonomy.taxeditor.model.IDerivedUnitFacadePart;
57
import eu.etaxonomy.taxeditor.model.MessagingUtils;
58 58
import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
59 59
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
60 60
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
......
95 95
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
96 96
import eu.etaxonomy.taxeditor.ui.section.occurrence.OriginalLabelDataSection;
97 97
import eu.etaxonomy.taxeditor.ui.section.occurrence.association.TaxonAssociationDetailSection;
98
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationCloningDetailSection;
99
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGelPhotoCollectionDetailSection;
100
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationGeneralDetailSection;
101
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AmplificationPrimerDetailSection;
102 98
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaQualityDetailSection;
103 99
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.DnaSampleGeneralDetailSection;
104 100
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SampleDesignationDetailSection;
......
244 240
                createSpecimenDescriptionSection(rootElement);
245 241
            }
246 242
            else{
247
                Set<Marker> descriptionMarkers = ((DescriptionBase) input).getMarkers();
243
                Set<Marker> descriptionMarkers = ((DescriptionBase<?>) input).getMarkers();
248 244
                MarkerType useMarkertype = (MarkerType) CdmStore.getService(ITermService.class).find(
249 245
                        UsageTermCollection.uuidUseMarkerType);
250 246
                Boolean isUseDescription = false;
......
253 249
                        isUseDescription = true;
254 250
                    }
255 251
                }
256
                if (((DescriptionBase) input).isImageGallery()) {
252
                if (((DescriptionBase<?>) input).isImageGallery()) {
257 253
                    createImageGallerySection(rootElement);
258 254

  
259 255
                } else if (isUseDescription) {
......
285 281

  
286 282
        } else if (input instanceof DerivedUnitFacade) {
287 283
            if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.FieldUnit){
288
                createFieldUnitSection(rootElement);
284
                if(((DerivedUnitFacade) input).innerFieldUnit()==null){
285
                    MessagingUtils.error(DetailsViewer.class, "FieldUnit of facade is null", null);
286
                }
287
                else{
288
                    createFieldUnitSection(rootElement);
289
                }
289 290
            }
290 291
            else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.PreservedSpecimen){
291
                createDerivedUnitBaseElementSection(rootElement);
292
                if(((DerivedUnitFacade) input).innerDerivedUnit()==null){
293
                    MessagingUtils.error(DetailsViewer.class, "DerivedUnit of facade is null", null);
294
                }
295
                else{
296
                    createDerivedUnitBaseElementSection(rootElement);
297
                }
292 298
            }
293 299
            else if(((DerivedUnitFacade) input).getType()==SpecimenOrObservationType.TissueSample){
294 300
                //TissueSample should only be created by using it's own class
......
309 315
        } else if (input instanceof MediaSpecimen){
310 316
            createMediaSpecimenSection(rootElement);
311 317
        }
312
        else if(input instanceof Amplification){
313
            createAmplificationSection(rootElement);
314
        }
315 318
        else if(input instanceof Sequence){
316 319
            createSequenceSection(rootElement);
317 320
        }
......
659 662
        destroySections();
660 663

  
661 664
        DerivedUnitGeneralDetailSection derivedUnitGeneralDetailSection = formFactory.createDerivedUnitGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
662
        //TODO for DerivateEditor do not use facade anymore to avoid this special case handling #4539 
665
        //TODO for DerivateEditor do not use facade anymore to avoid this special case handling #4539
663 666
        if(!(AbstractUtility.getActivePart() instanceof IDerivedUnitFacadePart)){
664 667
            derivedUnitGeneralDetailSection.setShowOnlyDerivedUnitData(true);
665 668
        }
......
754 757
        addPart(sampleDesignationDetailSection);
755 758
    }
756 759

  
757
    private void createAmplificationSection(RootElement parent) {
758
        destroySections();
759
        AmplificationGeneralDetailSection generalSection = formFactory.createAmplificationGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
760

  
761
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
762

  
763
        AmplificationPrimerDetailSection primerSection = formFactory.createAmplificationPrimerDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
764

  
765
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
766

  
767
        AmplificationCloningDetailSection cloningSection = formFactory.createAmplificationCloningDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
768

  
769
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
770

  
771
        AmplificationGelPhotoCollectionDetailSection gelPhotoSection = formFactory.createAmplificationGelPhotoCollectionDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
772

  
773

  
774
        addPart(generalSection);
775
        addPart(primerSection);
776
        addPart(cloningSection);
777
        addPart(gelPhotoSection);
778
    }
779

  
780 760
    private void createSequenceSection(RootElement parent) {
781 761
        destroySections();
782 762

  
......
800 780
        destroySections();
801 781

  
802 782
        SingleReadGeneralDetailSection section = formFactory.createSingleReadGeneralDetailSection(getConversationHolder(), parent, this, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
783
        addPart(section);
803 784

  
804 785
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
805 786

  
806 787
        SingleReadPherogramCollectionDetailSection pherogramSection = formFactory.createSingleReadPherogramCollectionDetailSection(getConversationHolder(), parent, ExpandableComposite.TWISTIE | ExpandableComposite.EXPANDED);
807

  
808
        addPart(section);
809 788
        addPart(pherogramSection);
789

  
810 790
    }
811 791

  
812 792
    private void createMediaSpecimenSection(RootElement parent) {

Also available in: Unified diff