Revision 29e1af1d
Added by Katja Luther over 5 years ago
cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dto/TaxonNodeDto.java | ||
---|---|---|
31 | 31 |
*/ |
32 | 32 |
private final int taxonomicChildrenCount; |
33 | 33 |
|
34 |
|
|
35 | 34 |
/** |
36 | 35 |
* The UUID of the associated secundum reference |
37 | 36 |
*/ |
... | ... | |
42 | 41 |
*/ |
43 | 42 |
private UUID taxonUuid = null; |
44 | 43 |
|
45 |
|
|
46 |
|
|
47 | 44 |
/** |
48 | 45 |
* the taggedTitle of the associated TaxonName entity |
49 | 46 |
*/ |
... | ... | |
63 | 60 |
* The Rank.label value of the rank to which the associated TaxonName entity is assigned to. |
64 | 61 |
*/ |
65 | 62 |
private String rankLabel = null; |
63 |
private Integer rankOrderIndex; |
|
66 | 64 |
|
67 | 65 |
private final TaxonStatus status; |
68 | 66 |
|
69 | 67 |
private final UUID classificationUUID; |
70 |
|
|
71 |
|
|
72 |
|
|
73 | 68 |
private final UUID parentUUID; |
74 | 69 |
|
75 | 70 |
private final String treeIndex; |
76 | 71 |
private final Integer sortIndex; |
77 | 72 |
|
78 |
private Integer rankOrderIndex; |
|
79 |
|
|
80 |
|
|
81 |
|
|
82 | 73 |
/** |
83 | 74 |
* @param taxonNode |
84 | 75 |
*/ |
... | ... | |
96 | 87 |
taggedTitle = taxon.getName() != null? taxon.getName().getTaggedName() : taxon.getTaggedTitle(); |
97 | 88 |
rankLabel = taxon.getNullSafeRank() != null ? taxon.getNullSafeRank().getLabel() : null; |
98 | 89 |
this.setAbbrevTitleCache(taxon.getTitleCache()); |
99 |
rankOrderIndex = taxon.getName() != null && taxon.getName().getRank() != null? taxon.getName().getRank().getOrderIndex() : null;
|
|
90 |
rankOrderIndex =taxon.getNullSafeRank() != null ? taxon.getNullSafeRank().getOrderIndex() : null;
|
|
100 | 91 |
|
101 | 92 |
}else{ |
102 | 93 |
setTitleCache(taxonNode.getClassification().getTitleCache()); |
... | ... | |
126 | 117 |
taggedTitle = synonym.getName().getTaggedName(); |
127 | 118 |
unplaced = false; |
128 | 119 |
excluded = false; |
129 |
rankLabel = synonym.getName().getRank().getLabel(); |
|
120 |
rankLabel = synonym.getNullSafeRank() != null ? synonym.getNullSafeRank().getLabel() : null; |
|
121 |
rankOrderIndex =synonym.getNullSafeRank() != null ? synonym.getNullSafeRank().getOrderIndex() : null; |
|
130 | 122 |
status = isHomotypic ? TaxonStatus.SynonymObjective : TaxonStatus.Synonym; |
131 | 123 |
classificationUUID = null; |
132 | 124 |
treeIndex = null; |
133 | 125 |
sortIndex = null; |
134 | 126 |
parentUUID = null; |
127 |
|
|
135 | 128 |
} |
136 | 129 |
|
137 | 130 |
|
... | ... | |
213 | 206 |
return rankOrderIndex; |
214 | 207 |
} |
215 | 208 |
|
216 |
|
|
217 | 209 |
public String getTaxonTitleCache(){ |
218 | 210 |
return getAbbrevTitleCache(); |
219 | 211 |
} |
Also available in: Unified diff
code cleaning