Project

General

Profile

« Previous | Next » 

Revision d82999cd

Added by Katja Luther over 2 years ago

ref #9900: fix consistent use of abbrev title for authors of nomenclatural reference

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
15 15

  
16 16
import javax.inject.Inject;
17 17

  
18
import org.apache.lucene.search.BulkScorer;
18 19
import org.eclipse.e4.core.di.annotations.Optional;
19 20
import org.eclipse.e4.ui.di.UIEventTopic;
20 21
import org.eclipse.jface.viewers.ISelection;
21 22
import org.eclipse.jface.viewers.IStructuredSelection;
22 23
import org.eclipse.jface.viewers.SelectionChangedEvent;
24
import org.eclipse.jface.viewers.StructuredSelection;
23 25
import org.eclipse.jface.viewers.TreeNode;
24 26
import org.eclipse.swt.SWT;
25 27
import org.springframework.security.core.GrantedAuthority;
......
30 32
import eu.etaxonomy.cdm.model.agent.Person;
31 33
import eu.etaxonomy.cdm.model.agent.Team;
32 34
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
35
import eu.etaxonomy.cdm.model.common.CdmBase;
33 36
import eu.etaxonomy.cdm.model.common.Marker;
34 37
import eu.etaxonomy.cdm.model.description.CategoricalData;
35 38
import eu.etaxonomy.cdm.model.description.Character;
......
52 55
import eu.etaxonomy.cdm.model.permission.Group;
53 56
import eu.etaxonomy.cdm.model.permission.User;
54 57
import eu.etaxonomy.cdm.model.reference.Reference;
58
import eu.etaxonomy.cdm.model.taxon.SecundumSource;
55 59
import eu.etaxonomy.cdm.model.taxon.Synonym;
56 60
import eu.etaxonomy.cdm.model.taxon.Taxon;
57 61
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
......
132 136
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.SingleReadPherogramCollectionDetailSection;
133 137
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.TissueSampleGeneralDetailSection;
134 138
import eu.etaxonomy.taxeditor.ui.section.occurrence.media.MediaSpecimenGeneralDetailSection;
135
import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalReferenceDetailSection;
139
import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalSourceDetailSection;
136 140
import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailSection;
141
import eu.etaxonomy.taxeditor.ui.section.reference.SecundumSourceSection;
137 142
import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsSection;
138 143
import eu.etaxonomy.taxeditor.ui.section.supplemental.identifier.DerivedUnitFacadeIdentifierSection;
139 144
import eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessagesSection;
......
209 214
            input = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.FieldUnit, (FieldUnit) input);
210 215
        }
211 216
        super.setInput(input);
217
        
218
        
212 219
    }
213 220

  
214 221
    @Override
......
477 484
            requiredCrud = EnumSet.of(CRUD.UPDATE);
478 485
        }
479 486
        boolean hasPermission = CdmStore.currentAuthentiationHasPermission(StoreUtil.getCdmEntity(getInput()), requiredCrud);
487
        TaxonBase<?> taxonBase = (TaxonBase<?>)getInput();
480 488
        if (hasPermission){
481 489
            // check for subtree permissions as well.
482
            TaxonBase<?> taxonBase = (TaxonBase<?>)getInput();
490
            
483 491
            Taxon acceptedTaxon = null;
484 492
            if (taxonBase instanceof Taxon){
485 493
                acceptedTaxon = (Taxon)taxonBase;
......
525 533
                addPart(taxonBaseDetailSection);
526 534
            }
527 535
        }
536
        //TODO: test code for secundum source section
537
//        SecundumSourceSection sourceSection = formFactory.createSecundumDetailSection(getConversationHolder(), parent, this, StoreUtil.getSectionStyle(SecundumSourceSection.class, getInput().getClass().getCanonicalName(), true));
538
//        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
539
//        addPart(sourceSection);
540
//        if (taxonBase.getSecSource() == null){
541
//            SecundumSource source = SecundumSource.NewSecundumInstance(taxonBase);
542
//            taxonBase.setSecSource(source);
543
//            sourceSection.setEntity(taxonBase);
544
//        }else{
545
//        	sourceSection.setEntity(taxonBase);
546
//        }
547
//
548
//        if (config != null && !config.isSecEnabled()){
549
//        	sourceSection.setEnabled(false);
550
//        }
528 551
        NonViralNameDetailSection nonViralNameSection = formFactory
529 552
                .createNonViralNameDetailSection(getConversationHolder(), parent, this, true,
530 553
                        StoreUtil.getSectionStyle(NonViralNameDetailSection.class, getInput().getClass().getCanonicalName(), true));
531 554
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
532 555
        nonViralNameSection.setEnabled(detailsEnabled);
533 556
        if (config == null || config.isNomenclaturalReferenceSectionActivated()){
534
            NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this,
535
                    StoreUtil.getSectionStyle(NomenclaturalReferenceDetailSection.class, getInput().getClass().getCanonicalName(), true));
557
            NomenclaturalSourceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this,
558
                    StoreUtil.getSectionStyle(NomenclaturalSourceDetailSection.class, getInput().getClass().getCanonicalName(), true));
536 559
            referenceDetailSection.setEnabled(detailsEnabled);
537 560
            formFactory.createHorizontalSeparator(parent, SWT.BORDER);
538 561
            addPart(referenceDetailSection);
......
577 600

  
578 601
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
579 602

  
580
        NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this,
581
                StoreUtil.getSectionStyle(NomenclaturalReferenceDetailSection.class, getInput().getClass().getCanonicalName(), true));
603
        NomenclaturalSourceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this,
604
                StoreUtil.getSectionStyle(NomenclaturalSourceDetailSection.class, getInput().getClass().getCanonicalName(), true));
582 605
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
583 606

  
584 607
        NomenclaturalStatusSection nomenclaturalStatusSection = formFactory.createNomenclaturalStatusSection(getConversationHolder(), parent,
......
939 962

  
940 963
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
941 964

  
942
        NomenclaturalReferenceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this,
943
                StoreUtil.getSectionStyle(NomenclaturalReferenceDetailSection.class, getInput().getClass().getCanonicalName(), true));
965
        NomenclaturalSourceDetailSection referenceDetailSection = formFactory.createNomenclaturalReferenceDetailSection(getConversationHolder(), parent, this,
966
                StoreUtil.getSectionStyle(NomenclaturalSourceDetailSection.class, getInput().getClass().getCanonicalName(), true));
944 967
        formFactory.createHorizontalSeparator(parent, SWT.BORDER);
945 968
        addPart(referenceDetailSection);
946 969

  

Also available in: Unified diff