ref #7849: check all voc if no pref exist

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
index 7b954fc795a575588409f8cdb44f49a8fd7c6274..a60773859c326b7852e31f6b60f32d607ab5a794 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AbstractTermSelectionWizardPage.java
@@ -85,6 +85,7 @@ public abstract class AbstractTermSelectionWizardPage extends WizardPage {
 
     protected void rememberCheckedValues(String checkedValues) {
         initialiseVocabularies();
+
         treeComposite.getViewer().setInput(getVocabularies());
 
         if (checkedValues != null && checkedValues != "") { //$NON-NLS-1$
@@ -103,7 +104,7 @@ public abstract class AbstractTermSelectionWizardPage extends WizardPage {
         }
     }
 
-    private List<AbstractTermDto> getTermsFromStringValues(List<String> listValue) {
+    protected List<AbstractTermDto> getTermsFromStringValues(List<String> listValue) {
         List<AbstractTermDto> termlist = new ArrayList<>();
         for (String s : listValue) {
             if (!StringUtils.isBlank(s)){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableAreaVocabulariesPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableAreaVocabulariesPage.java
index b38080873c094fc02c93f0cb8ff7f804dcee87b5..ebc2a18e3a5fbb6d36e42b2093e600f9feaa954d 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableAreaVocabulariesPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableAreaVocabulariesPage.java
@@ -8,6 +8,8 @@
 */
 package eu.etaxonomy.taxeditor.preference.wizard;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
@@ -18,6 +20,7 @@ import org.eclipse.swt.widgets.Composite;
 import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.TermType;
 import eu.etaxonomy.cdm.model.metadata.CdmPreference;
+import eu.etaxonomy.cdm.persistence.dto.AbstractTermDto;
 import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
 import eu.etaxonomy.taxeditor.editor.definedterm.RootElementsOnlyTreeContentProvider;
 import eu.etaxonomy.taxeditor.l10n.Messages;
@@ -98,6 +101,30 @@ public class AvailableAreaVocabulariesPage  extends AbstractAdminTermSelectionWi
         // TODO Auto-generated method stub
         return null;
     }
+    @Override
+    protected void rememberCheckedValues(String checkedValues) {
+        initialiseVocabularies();
+
+        treeComposite.getViewer().setInput(getVocabularies());
+
+        if (checkedValues != null && checkedValues != "") { //$NON-NLS-1$
+            String[] listChecked = checkedValues.split(";"); //$NON-NLS-1$
+            String[] listCheckedComma = checkedValues.split(","); //$NON-NLS-1$
+            List<String> checked = new ArrayList<>();
+            if (listChecked != null ){
+                checked = Arrays.asList(listChecked);
+            }
+            if (listCheckedComma != null && checkedValues.contains(",")){ //$NON-NLS-1$
+                checked = Arrays.asList(listCheckedComma);
+            }
+            List<AbstractTermDto> termsFromStringValues = getTermsFromStringValues(checked);
+            treeComposite.setCheckedElements(termsFromStringValues.toArray());
+
+        }else{
+
+            treeComposite.getViewer().setAllChecked(true);
+        }
+    }