Merge branch 'release/5.42.0'

diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
index 1276d26c8e518086eff4a4502b4794c5569a405f,e5b52e0d258fcbf714a62fd70b5b45ef54128257..1a8048e2e92a204a91205be6de672f7580231fc8
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
--- 2/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/CheckBoxTreeComposite.java
@@@ -55,8 -55,8 +55,9 @@@ public class CheckBoxTreeComposite exte
      protected Object[] checkedElements;
  
      protected boolean allowTopLevelSelection = false;
 +    
  
+ 
      public CheckBoxTreeComposite(Composite parent, ITreeContentProvider contentProvider, IBaseLabelProvider labelProvider, int style) {
          super(parent, style);
          GridLayout layout = new GridLayout();
@@@ -308,41 -306,41 +309,75 @@@
              }
          }
      }
 +    
 +    private void updateAfterCheckElement(Object item) {
 +        Set<Object> tempList = new HashSet<>();
 +        if (checkedElements != null) {
 +            Collections.addAll(tempList, checkedElements);
 +        }        
 +        TermNodeDto checkedNode = null;
 +        TermDto checkedTerm = null;
 +        TreeItem treeItem = null;
 +        if (item instanceof TreeItem) {
 +             treeItem = (TreeItem) item;   
 +             if (treeItem.getData() instanceof TermNodeDto) {
 +                 checkedNode = (TermNodeDto)treeItem.getData();
 +                 checkedTerm = checkedNode.getTerm();
 +             }else if (treeItem.getData() instanceof TermDto) {           
 +                 checkedTerm = (TermDto)treeItem.getData();
 +             }else {
 +                 return;
 +             }
 +        }else  if (item instanceof TermNodeDto) {
 +            checkedNode = (TermNodeDto)item;
 +            checkedTerm = checkedNode.getTerm();
 +        }else if (item instanceof TermDto) {           
 +            checkedTerm = (TermDto)item;
 +        }else {
 +            return;
 +        } 
 +        if (checkedTerm != null) {
 +            tempList.add(checkedTerm);
 +        }
 +        
 +        setCheckedElements(tempList.toArray());
 +        
 +    }
  
+     private void updateAfterCheckElement(Object item) {
+         Set<Object> tempList = new HashSet<>();
+         if (checkedElements != null) {
+             Collections.addAll(tempList, checkedElements);
+         }
+         TermNodeDto checkedNode = null;
+         TermDto checkedTerm = null;
+         TreeItem treeItem = null;
+         if (item instanceof TreeItem) {
+              treeItem = (TreeItem) item;
+              if (treeItem.getData() instanceof TermNodeDto) {
+                  checkedNode = (TermNodeDto)treeItem.getData();
+                  checkedTerm = checkedNode.getTerm();
+              }else if (treeItem.getData() instanceof TermDto) {
+                  checkedTerm = (TermDto)treeItem.getData();
+              }else {
+                  return;
+              }
+         }else  if (item instanceof TermNodeDto) {
+             checkedNode = (TermNodeDto)item;
+             checkedTerm = checkedNode.getTerm();
+         }else if (item instanceof TermDto) {
+             checkedTerm = (TermDto)item;
+         }else {
+             return;
+         }
+         if (checkedTerm != null) {
+             tempList.add(checkedTerm);
+         }
+ 
+         setCheckedElements(tempList.toArray());
+ 
+     }
+ 
      protected TreeItem getRoot(TreeItem treeItem) {
          TreeItem parent = treeItem;
          while(parent.getParentItem()!=null){