From: Katja Luther Date: Mon, 31 May 2021 09:30:41 +0000 (+0200) Subject: ref #8776: fix d&d for not allow duplicates X-Git-Tag: 5.24.0^2~18 X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/f37fa36724a56789ddcbc1279ecdc3e8c0f2268d ref #8776: fix d&d for not allow duplicates --- diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java index fa1e23219..f66184ea6 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/termtree/e4/TermTreeDtoDropAdapter.java @@ -253,6 +253,13 @@ public class TermTreeDtoDropAdapter extends ViewerDropAdapter { if (target instanceof TermNodeDto && ((TermNodeDto)target).getTree().isFlat() && getCurrentLocation() == LOCATION_ON){ isSupported = false; } + TermDto term = null; + if (getSelectedObject() instanceof TermNodeDto){ + term = ((TermNodeDto)getSelectedObject()).getTerm(); + } + 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))){ + isSupported = false; + } return isSupported; }