Project

General

Profile

« Previous | Next » 

Revision 88df332d

Added by Katja Luther over 5 years ago

smaller changes in preferences for distribution vocabularies

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/AvailableAreaVocabulariesPage.java
8 8
*/
9 9
package eu.etaxonomy.taxeditor.preference.wizard;
10 10

  
11
import java.util.ArrayList;
11 12
import java.util.Collection;
13
import java.util.HashSet;
12 14
import java.util.List;
13 15
import java.util.Map;
16
import java.util.Set;
17
import java.util.UUID;
14 18

  
19
import org.apache.commons.lang.StringUtils;
15 20
import org.eclipse.jface.viewers.CheckStateChangedEvent;
16 21
import org.eclipse.jface.viewers.CheckboxTableViewer;
17 22
import org.eclipse.jface.viewers.ICheckStateListener;
......
24 29
import org.eclipse.swt.widgets.Composite;
25 30
import org.eclipse.swt.widgets.Display;
26 31

  
32
import eu.etaxonomy.cdm.api.service.IVocabularyService;
27 33
import eu.etaxonomy.cdm.model.common.CdmBase;
34
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
28 35
import eu.etaxonomy.cdm.model.common.TermType;
36
import eu.etaxonomy.cdm.model.common.TermVocabulary;
29 37
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
38
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
30 39
import eu.etaxonomy.taxeditor.editor.definedterm.VocabularyContentProvider;
31 40
import eu.etaxonomy.taxeditor.editor.definedterm.VocabularyLabelProvider;
32 41
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
33 42
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
34 43
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
44
import eu.etaxonomy.taxeditor.store.CdmStore;
35 45

  
36 46
/**
37 47
 * @author k.luther
......
135 145
        return null;
136 146
    }
137 147

  
148
    @Override
149
    protected  List<TermVocabulary<DefinedTermBase>> getVocabulariesFromPreference(){
150
        List<TermVocabulary<DefinedTermBase>> vocs = new ArrayList();
151

  
152
        if (PreferencesUtil.getPreferenceFromDB(PreferencePredicate.AvailableDistributionAreaVocabularies) == null ){
153
            vocs = CdmStore.getService(IVocabularyService.class).findByTermType(
154
                    type, null);
155
        }else{
156
            String vocString = PreferencesUtil.getPreferenceStore().getString(PreferencesUtil.DISTRIBUTION_VOCABULARIES);
157

  
158
            String[] arrayVocs = vocString.split(";");
138 159

  
160
            Set<UUID> uuidVocs = new HashSet();
161
            for (String voc: arrayVocs){
162
                if (!StringUtils.isBlank(voc)){
163
                    uuidVocs.add(UUID.fromString(voc));
164
                }
165
            }
166
            List<TermVocabulary> tempVocs = CdmStore.getService(IVocabularyService.class).find(uuidVocs);
167
            for (TermVocabulary voc: tempVocs){
168
                vocs.add(voc);
169
            }
170

  
171
        }
172
        return vocs;
173
    }
139 174

  
140 175
}

Also available in: Unified diff