Project

General

Profile

Revision 084507a8

ID084507a862bb04891507962ea8b62204f1da51e2
Parent dcd0919e
Child ccab0dd5

Added by Cherian Mathew about 5 years ago

Adapt to tagged text methods change to protected

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/jscomponent/D3ConceptRelationshipTree.java
30 30
import eu.etaxonomy.cdm.model.taxon.Taxon;
31 31
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
32 32
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
33
import eu.etaxonomy.cdm.strategy.cache.TagEnum;
33 34
import eu.etaxonomy.cdm.strategy.cache.TaggedText;
34 35
import eu.etaxonomy.cdm.vaadin.component.ConceptRelationshipComposite;
35 36

  
......
226 227
        boolean foundGenusOrUninomial = false;
227 228
        boolean previousTagSeparator = false;
228 229
        for(TaggedText tt: taggedTextList) {
229
            if(!tt.isYear() &&!tt.isReference() && !tt.isAuthors()) {
230
                if(tt.isName() && !foundGenusOrUninomial) {
230
            if(!(tt.getType() == TagEnum.year) &&
231
                    !(tt.getType() == TagEnum.reference) &&
232
                    !(tt.getType() == TagEnum.authors)) {
233
                if(tt.getType() == TagEnum.name && !foundGenusOrUninomial) {
231 234
                    nameSb.append(tt.getText().charAt(0) + ".");
232 235
                    foundGenusOrUninomial = true;
233 236
                } else {
......
236 239
                    }
237 240
                    nameSb.append(tt.getText());
238 241
                    previousTagSeparator = false;
239
                    if(tt.isSeparator()) {
242
                    if(tt.getType() == TagEnum.separator) {
240 243
                        previousTagSeparator = true;
241 244
                    }
242 245
                }

Also available in: Unified diff

Add picture from clipboard (Maximum size: 40 MB)