Revision 652e719d
Added by Andreas Müller about 3 years ago
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/InverseTermWrapper.java | ||
---|---|---|
71 | 71 |
|
72 | 72 |
languages.add(CdmStore.getDefaultLanguage()); |
73 | 73 |
Representation rep = term.getPreferredInverseRepresentation(languages); |
74 |
if (useAbbrevLabel){ |
|
75 |
termLabel = rep.getAbbreviatedLabel(); |
|
76 |
if (termLabel == null){ |
|
74 |
if (rep != null){ |
|
75 |
if (useAbbrevLabel){ |
|
76 |
termLabel = rep.getAbbreviatedLabel(); |
|
77 |
if (termLabel == null){ |
|
78 |
termLabel = rep.getLabel(); |
|
79 |
} |
|
80 |
}else{ |
|
77 | 81 |
termLabel = rep.getLabel(); |
78 | 82 |
} |
79 |
|
|
80 |
}else{ |
|
81 |
termLabel = rep.getLabel(); |
|
82 | 83 |
} |
83 | 84 |
if (termLabel == null){ |
84 | 85 |
termLabel = term.getInverseLabel(); |
... | ... | |
102 | 103 |
}else{ |
103 | 104 |
String termLabel = null; |
104 | 105 |
Representation rep = term.getPreferredRepresentation(CdmStore.getDefaultLanguage()); |
105 |
if (useAbbrevLabel){ |
|
106 |
termLabel = rep.getAbbreviatedLabel(); |
|
107 |
if (termLabel == null){ |
|
106 |
if (rep != null){ |
|
107 |
if (useAbbrevLabel){ |
|
108 |
termLabel = rep.getAbbreviatedLabel(); |
|
109 |
if (termLabel == null){ |
|
110 |
termLabel = rep.getLabel(); |
|
111 |
} |
|
112 |
}else{ |
|
108 | 113 |
termLabel = rep.getLabel(); |
109 | 114 |
} |
110 |
}else{ |
|
111 |
termLabel = rep.getLabel(); |
|
112 | 115 |
} |
113 | 116 |
if (termLabel == null){ |
114 | 117 |
termLabel = term.getLabel(); |
Also available in: Unified diff
fix potential NPE in InverseTermWrapper