ref #7887 Fix preference persisting (based on DTOs)

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionWizard.java
index 2d884406a05e808007c072cbc09e24d43cbd27e9..5959b4cdb41c37379f73c78f0a67509d231c229f 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableDistributionWizard.java
@@ -14,13 +14,12 @@ import java.util.UUID;
 
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.StringUtils;
-import org.eclipse.jface.viewers.CheckboxTreeViewer;
 import org.eclipse.jface.wizard.Wizard;
 
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
-import eu.etaxonomy.cdm.model.location.NamedArea;
+import eu.etaxonomy.cdm.persistence.dto.TermDto;
+import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
@@ -51,32 +50,30 @@ public class AvailableDistributionWizard extends Wizard implements IConversation
     public boolean performFinish() {
         // TODO: get Selection and save in EditorPreferences
         if (!checkNoneChecked()) {
-            Object[] checkedElements = ((CheckboxTreeViewer)aPage.getViewer()).getCheckedElements();
-            Object[] grayedElements = ((CheckboxTreeViewer)aPage.getViewer()).getGrayedElements();
+            Object[] checkedElements = aPage.getViewer().getCheckedElements();
+            Object[] grayedElements = aPage.getViewer().getGrayedElements();
             ArrayList checkedList = new ArrayList(Arrays.asList(checkedElements));
             ArrayList grayedList = new ArrayList(Arrays.asList(grayedElements));
             checkedList = (ArrayList) CollectionUtils.subtract(checkedList, grayedList);
             ArrayList<UUID> listUIIDChecked = new ArrayList<UUID>();
             ArrayList<UUID> listUIIDGrayed = new ArrayList<UUID>();
             for (Object o : checkedList) {
-                if (o instanceof NamedAreaWrapper) {
-                    NamedArea na = (NamedArea)((NamedAreaWrapper) o).getNamedArea();
-                    listUIIDChecked.add(na.getUuid());
+                if (o instanceof TermDto) {
+                    listUIIDChecked.add(((TermDto) o).getUuid());
 
-                }else if(o instanceof OrderedTermVocabulary){
-                    OrderedTermVocabulary otb = (OrderedTermVocabulary) o;
-                    listUIIDGrayed.add(otb.getUuid());
+                }else if(o instanceof TermVocabularyDto){
+                    TermVocabularyDto termVocDto = (TermVocabularyDto) o;
+                    listUIIDGrayed.add(termVocDto.getUuid());
                 }
             }
             for (Object o : grayedList) {
-                if (o instanceof NamedAreaWrapper) {
-                    NamedArea na = (NamedArea)((NamedAreaWrapper) o).getNamedArea();
-                    listUIIDGrayed.add(na.getUuid());
-                }else if(o instanceof OrderedTermVocabulary){
-                    OrderedTermVocabulary otb = (OrderedTermVocabulary) o;
-                    listUIIDGrayed.add(otb.getUuid());
-                }
+                if (o instanceof TermDto) {
+                    listUIIDChecked.add(((TermDto) o).getUuid());
 
+                }else if(o instanceof TermVocabularyDto){
+                    TermVocabularyDto termVocDto = (TermVocabularyDto) o;
+                    listUIIDGrayed.add(termVocDto.getUuid());
+                }
             }
 
             String saveCheckedElements = StringUtils.join(listUIIDChecked, ";"); //$NON-NLS-1$
@@ -100,7 +97,7 @@ public class AvailableDistributionWizard extends Wizard implements IConversation
 
     private boolean checkNoneChecked() {
 
-        if (((CheckboxTreeViewer)aPage.getViewer()).getCheckedElements().length == 0) {
+        if (aPage.getViewer().getCheckedElements().length == 0) {
             aPage.setMessage(Messages.AvailableDistributionWizard_CHECK_MESSAGE, aPage.WARNING);
             return true;
         } else {