Revision 29aeffbe
Added by Cherian Mathew almost 9 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/component/StatusComposite.java | ||
---|---|---|
106 | 106 |
|
107 | 107 |
private final boolean taxaTreeTableMultiSelectMode = true; |
108 | 108 |
|
109 |
private static final String SELECT_FILTER = "Select filter ..."; |
|
110 | 109 |
private static final String SELECT_CLASSIFICATION = "Select classification ..."; |
111 | 110 |
|
112 |
private static final String ADD_TAXON_SYNONYM_INPUT = "Add ..."; |
|
111 |
|
|
113 | 112 |
private static final String CREATE_ACC_TAXON = "Create Accepted Taxon"; |
113 |
private static final String CHANGE_TO_ACC_TAXON = "Change to Accepted Taxon"; |
|
114 |
private static final String REPLACE_ACC_TAXON = "Replace Accepted Taxon"; |
|
115 |
private static final String CHANGE_TO_SYNONYM = "Change to Synonym"; |
|
114 | 116 |
private static final String CREATE_SYNONYM = "Create Synonym"; |
115 | 117 |
private static final String SET_AS_DELETED = "Set as Deleted"; |
116 | 118 |
private static final String SET_AS_EXCLUDED = "Set as Excluded"; |
... | ... | |
282 | 284 |
container.addContainerProperty("filter", String.class, ""); |
283 | 285 |
container.addContainerProperty("selected", Boolean.class, ""); |
284 | 286 |
|
285 |
// Item item = container.addItem(FILTER_NOT_RESOLVED); |
|
286 |
// item.getItemProperty(PROPERTY_FILTER_ID).setValue(FILTER_NOT_RESOLVED); |
|
287 |
// item.getItemProperty(PROPERTY_SELECTED_ID).setValue(false); |
|
288 |
// |
|
289 |
// item = container.addItem(FILTER_UNPLACED); |
|
290 |
// item.getItemProperty(PROPERTY_FILTER_ID).setValue(FILTER_UNPLACED); |
|
291 |
// item.getItemProperty(PROPERTY_SELECTED_ID).setValue(false); |
|
292 |
|
|
293 | 287 |
Item item = container.addItem(FILTER_UNFINISHED); |
294 | 288 |
item.getItemProperty(PROPERTY_FILTER_ID).setValue(FILTER_UNFINISHED); |
295 | 289 |
item.getItemProperty(PROPERTY_SELECTED_ID).setValue(false); |
... | ... | |
409 | 403 |
.fireSelectionEvent(new SelectionEvent(Arrays.asList(idUuidName, getSelectedClassificationUuid()), StatusComposite.class), true); |
410 | 404 |
} |
411 | 405 |
taxaTreeTable.setValue(Arrays.asList(itemId)); |
412 |
generateTaxaTreeTableContextMenu(!isSynonym);
|
|
406 |
generateTaxaTreeTableContextMenu(isSynonym); |
|
413 | 407 |
|
414 | 408 |
} |
415 | 409 |
} |
... | ... | |
424 | 418 |
|
425 | 419 |
taxaTableContextMenu.removeAllItems(); |
426 | 420 |
if(isSynonym) { |
421 |
|
|
422 |
|
|
423 |
ContextMenuItem changeToAccTaxonMenuItem = taxaTableContextMenu.addItem(CHANGE_TO_ACC_TAXON); |
|
424 |
changeToAccTaxonMenuItem.setData(CHANGE_TO_ACC_TAXON); |
|
425 |
|
|
426 |
ContextMenuItem replaceAccTaxonMenuItem = taxaTableContextMenu.addItem(REPLACE_ACC_TAXON); |
|
427 |
replaceAccTaxonMenuItem.setData(REPLACE_ACC_TAXON); |
|
428 |
|
|
429 |
replaceAccTaxonMenuItem.setSeparatorVisible(true); |
|
430 |
} else { |
|
427 | 431 |
ContextMenuItem createSynMenuItem = taxaTableContextMenu.addItem(CREATE_SYNONYM); |
428 | 432 |
createSynMenuItem.setData(CREATE_SYNONYM); |
433 |
|
|
434 |
ContextMenuItem changeToSynMenuItem = taxaTableContextMenu.addItem(CHANGE_TO_SYNONYM); |
|
435 |
changeToSynMenuItem.setData(CHANGE_TO_SYNONYM); |
|
436 |
|
|
437 |
changeToSynMenuItem.setSeparatorVisible(true); |
|
429 | 438 |
} |
439 |
|
|
430 | 440 |
ContextMenuItem setDeletedMenuItem = taxaTableContextMenu.addItem(SET_AS_DELETED); |
431 | 441 |
setDeletedMenuItem.setData(SET_AS_DELETED); |
432 | 442 |
|
... | ... | |
436 | 446 |
ContextMenuItem setOutOfScopeMenuItem = taxaTableContextMenu.addItem(SET_AS_OUT_OF_SCOPE); |
437 | 447 |
setOutOfScopeMenuItem.setData(SET_AS_OUT_OF_SCOPE); |
438 | 448 |
|
439 |
setOutOfScopeMenuItem.setSeparatorVisible(true); |
|
440 |
|
|
441 | 449 |
ContextMenuItem createAccTaxonMenuItem = taxaTableContextMenu.addItem(CREATE_ACC_TAXON); |
442 | 450 |
createAccTaxonMenuItem.setData(CREATE_ACC_TAXON); |
443 | 451 |
|
Also available in: Unified diff
EditConceptRelationshipComposite : show notification only when creating concept relationship
NewTaxonBaseComposite : added second sec. combobox for the case of creating synonyms
INewTaxonBaseComponentListener, NewTaxonBasePresenter : creating separate containers for acc. taxon and synonym references
NewTaxonBasePresenter, NewTaxonBasePresenterTest : updated new synonym method to include acc. taxon sec in input
StatusComposite : added move / change actions to context menu