Project

General

Profile

« Previous | Next » 

Revision 719ac7ab

Added by Patrick Plitzner over 4 years ago

ref #8475 Add applicability detail element to character details view

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
25 25
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
26 26
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException;
27 27
import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
28
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
29 28
import eu.etaxonomy.cdm.model.agent.Person;
30 29
import eu.etaxonomy.cdm.model.agent.Team;
31 30
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
32
import eu.etaxonomy.cdm.model.permission.Group;
33 31
import eu.etaxonomy.cdm.model.common.Marker;
34
import eu.etaxonomy.cdm.model.permission.User;
35 32
import eu.etaxonomy.cdm.model.description.CategoricalData;
36 33
import eu.etaxonomy.cdm.model.description.Character;
37 34
import eu.etaxonomy.cdm.model.description.DescriptionBase;
......
49 46
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
50 47
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
51 48
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
49
import eu.etaxonomy.cdm.model.permission.Group;
50
import eu.etaxonomy.cdm.model.permission.User;
52 51
import eu.etaxonomy.cdm.model.reference.Reference;
53 52
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
54 53
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
55 54
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
56 55
import eu.etaxonomy.cdm.model.term.TermNode;
57 56
import eu.etaxonomy.cdm.model.term.TermTree;
57
import eu.etaxonomy.cdm.model.term.TermType;
58 58
import eu.etaxonomy.cdm.model.term.TermVocabulary;
59 59
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
60 60
import eu.etaxonomy.taxeditor.editor.IDistributionEditor;
......
83 83
import eu.etaxonomy.taxeditor.ui.section.description.NaturalLanguageSection;
84 84
import eu.etaxonomy.taxeditor.ui.section.description.ScopeSection;
85 85
import eu.etaxonomy.taxeditor.ui.section.feature.CharacterDetailSection;
86
import eu.etaxonomy.taxeditor.ui.section.feature.CharacterNodeDetailSection;
86 87
import eu.etaxonomy.taxeditor.ui.section.feature.FeatureDistributionDetailSection;
87 88
import eu.etaxonomy.taxeditor.ui.section.feature.FeatureNodeDetailSection;
88 89
import eu.etaxonomy.taxeditor.ui.section.feature.FeatureTreeDetailSection;
......
177 178
        if(input instanceof GbifResponse){
178 179
            input = ((GbifResponse) input).getDerivedUnitFacade();
179 180
        }
180
        if(input instanceof TermNode
181
                && HibernateProxyHelper.isInstanceOf(((TermNode) input).getTerm(), Character.class)){
182
            input = HibernateProxyHelper.deproxy(((TermNode) input).getTerm(), Character.class);
183
        }
184 181
        if (input !=null && input.getClass().equals(DerivedUnit.class)) {
185 182
            DerivedUnit derivedUnit = (DerivedUnit)input;
186 183
            try {
......
359 356
            createFeatureDistributionSection(rootElement);
360 357

  
361 358
        } else if (input instanceof TermNode) {
362
            createFeatureNodeSection(rootElement);
359
            TermType type= ((TermNode) input).getTermType();
360
            if(type.equals(TermType.Character)){
361
                createCharacterNodeSection(rootElement);
362
            }
363
            else{
364
                createFeatureNodeSection(rootElement);
365
            }
363 366

  
364 367
        } else if (input instanceof TermTree) {
365 368
            createFeatureTreeSection(rootElement);
......
779 782
        addPart(featureDistributionSection);
780 783
    }
781 784

  
785
    private void createCharacterNodeSection(RootElement parent) {
786
        CharacterNodeDetailSection featureDistributionSection = formFactory.createCharacterNodeDetailSection(getConversationHolder(), parent, this, StoreUtil.getSectionStyle(CharacterDetailSection.class, getInput().getClass().getCanonicalName(), true));
787
        addPart(featureDistributionSection);
788
    }
789

  
782 790
    private void createCharacterSection(RootElement parent) {
783 791
        CharacterDetailSection featureDistributionSection = formFactory.createCharacterDetailSection(getConversationHolder(), parent, this, StoreUtil.getSectionStyle(CharacterDetailSection.class, getInput().getClass().getCanonicalName(), true));
784

  
785 792
        addPart(featureDistributionSection);
786 793
    }
787 794

  

Also available in: Unified diff