Revision 137d0ad0
Added by Andreas Müller over 3 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermTreeMenu.java | ||
|---|---|---|
| 90 | 90 |
} |
| 91 | 91 |
else{
|
| 92 | 92 |
MMenu subMenu = MMenuFactory.INSTANCE.createMenu(); |
| 93 |
subMenu.setLabel(termType.getMessage(PreferencesUtil.getGlobalLanguage()));
|
|
| 93 |
subMenu.setLabel(termType.getLabel(PreferencesUtil.getGlobalLanguage()));
|
|
| 94 | 94 |
items.add(subMenu); |
| 95 | 95 |
// term type has children, so create sub menu |
| 96 | 96 |
subMenu.getChildren().add(createDefaultMenuItem(termType)); |
| ... | ... | |
| 109 | 109 |
private MHandledMenuItem createMenuItem(TermType termType) {
|
| 110 | 110 |
|
| 111 | 111 |
MHandledMenuItem menuItem = MMenuFactory.INSTANCE.createHandledMenuItem(); |
| 112 |
menuItem.setLabel(termType.getMessage());
|
|
| 112 |
menuItem.setLabel(termType.getLabel());
|
|
| 113 | 113 |
MCommand mCommand = MCommandsFactory.INSTANCE.createCommand(); |
| 114 | 114 |
mCommand.setElementId(COMMAND_ID); |
| 115 | 115 |
|
| ... | ... | |
| 123 | 123 |
private MHandledMenuItem createDefaultMenuItem(TermType termType) {
|
| 124 | 124 |
|
| 125 | 125 |
MHandledMenuItem menuItem = MMenuFactory.INSTANCE.createHandledMenuItem(); |
| 126 |
menuItem.setLabel(String.format(Messages.DefinedTermMenu_OTHER_S, termType.getMessage()));
|
|
| 126 |
menuItem.setLabel(String.format(Messages.DefinedTermMenu_OTHER_S, termType.getLabel()));
|
|
| 127 | 127 |
MCommand mCommand = MCommandsFactory.INSTANCE.createCommand(); |
| 128 | 128 |
mCommand.setElementId(COMMAND_ID); |
| 129 | 129 |
|
| ... | ... | |
| 141 | 141 |
if (t1.equals(t2)){
|
| 142 | 142 |
return 0; |
| 143 | 143 |
} |
| 144 |
int result = t1.getMessage().compareTo(t2.getMessage());
|
|
| 144 |
int result = t1.getLabel().compareTo(t2.getLabel());
|
|
| 145 | 145 |
if (result == 0){
|
| 146 | 146 |
return t1.compareTo(t2); |
| 147 | 147 |
} |
Also available in: Unified diff
ref #9280 adapt TaxEditor to new Term.getLabel()