Revision bfcdd64e
Added by Katja Luther almost 3 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java | ||
|---|---|---|
| 257 | 257 |
if (getSelectedObject() instanceof TermNodeDto){
|
| 258 | 258 |
term = ((TermNodeDto)getSelectedObject()).getTerm(); |
| 259 | 259 |
} |
| 260 |
// if ((target instanceof TermNodeDto && !((TermNodeDto)target).getTree().isAllowDuplicate() && ((TermNodeDto)target).getTree().getTerms().contains(term)) || (target instanceof TermTreeDto && !((TermTreeDto)target).isAllowDuplicate() && ((TermTreeDto)target).getTerms().contains(term))){
|
|
| 261 |
// isSupported = false; |
|
| 262 |
// } |
|
| 260 |
if ((target instanceof TermNodeDto && !((TermNodeDto)target).getTree().isAllowDuplicate() && ((TermNodeDto)target).getTree().getTerms().contains(term)) || (target instanceof TermTreeDto && !((TermTreeDto)target).isAllowDuplicate() && ((TermTreeDto)target).getTerms().contains(term))){
|
|
| 261 |
TermTreeDto targetTree = null; |
|
| 262 |
if (target instanceof TermNodeDto){
|
|
| 263 |
targetTree = ((TermNodeDto)target).getTree(); |
|
| 264 |
}else if (target instanceof TermTreeDto){
|
|
| 265 |
targetTree = (TermTreeDto)target; |
|
| 266 |
} |
|
| 267 |
|
|
| 268 |
if (!(((TermNodeDto)getSelectedObject()).getTree() != null && ((TermNodeDto)getSelectedObject()).getTree().equals(targetTree))){
|
|
| 269 |
isSupported = false; |
|
| 270 |
} |
|
| 271 |
} |
|
| 263 | 272 |
return isSupported; |
| 264 | 273 |
} |
| 265 | 274 |
|
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/handler/CreateTermTreeHandler.java | ||
|---|---|---|
| 61 | 61 |
((TermTreeEditor)editor).getViewer(), sel); |
| 62 | 62 |
((TermTreeEditor)editor).selectionChanged(event); |
| 63 | 63 |
|
| 64 |
|
|
| 64 | 65 |
} |
| 65 | 66 |
|
| 66 | 67 |
@CanExecute |
Also available in: Unified diff
ref #8776: fix d&d check for duplicates