Project

General

Profile

« Previous | Next » 

Revision 787028b1

Added by Patrick Plitzner over 7 years ago

ref #5458 Fix some intitialization problems

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/settings/SettingsPresenter.java
10 10
package eu.etaxonomy.cdm.vaadin.presenter.dbstatus.settings;
11 11

  
12 12
import java.util.Arrays;
13
import java.util.Collections;
13 14
import java.util.List;
14 15
import java.util.UUID;
15 16

  
......
17 18
import com.vaadin.data.util.IndexedContainer;
18 19
import com.vaadin.server.VaadinSession;
19 20

  
21
import eu.etaxonomy.cdm.api.service.IClassificationService;
20 22
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
21 23
import eu.etaxonomy.cdm.api.service.ITermService;
22 24
import eu.etaxonomy.cdm.api.service.IVocabularyService;
23 25
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
24 26
import eu.etaxonomy.cdm.model.common.TermType;
25 27
import eu.etaxonomy.cdm.model.common.TermVocabulary;
28
import eu.etaxonomy.cdm.model.taxon.Classification;
26 29
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
27 30
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper;
28 31
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil;
......
39 42
    private IVocabularyService vocabularyService;
40 43
    private ITermService termService;
41 44
    private ITaxonNodeService taxonNodeService;
42
    private UUID taxonNodeUuid;
45
    private IClassificationService classificationService;
43 46
    private UUID termUUID;
44 47

  
45 48

  
46 49

  
47 50
    public SettingsPresenter(){
48 51
        taxonNodeService = CdmSpringContextHelper.getTaxonNodeService();
49
		Object taxonNodeUuidString = VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_TAXON_NODE_UUID);
52
        classificationService = CdmSpringContextHelper.getClassificationService();
50 53
		Object selectedVocabularyUuidString = VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_SELECTED_VOCABULARY_UUID);
51
		if(taxonNodeUuidString!=null){
52
			taxonNodeUuid = UUID.fromString(taxonNodeUuidString.toString());
53
		}
54 54
		if(selectedVocabularyUuidString!=null){
55 55
			termUUID = UUID.fromString(selectedVocabularyUuidString.toString());
56 56
		}
......
58 58
		distributionStatusContainer = new IndexedContainer(getPresenceAbsenceVocabulary());
59 59
    }
60 60

  
61
    public TaxonNode getChosenTaxonNode(){
62
        return taxonNodeService.load(taxonNodeUuid);
61
    public List<TaxonNode> getChosenTaxonNodes(){
62
    	List<UUID> nodeUuids = (List<UUID>) VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_TAXON_NODES_UUID);
63
    	if(nodeUuids!=null){
64
    		return taxonNodeService.load(nodeUuids, null);
65
    	}
66
    	return Collections.emptyList();
67
    }
68

  
69
    public Classification getChosenClassification(){
70
    	UUID uuid = (UUID) VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_CLASSIFICATION);
71
    	if(uuid!=null){
72
    		return classificationService.load(uuid);
73
    	}
74
    	return null;
63 75
    }
64 76

  
65 77
    public TermVocabulary getChosenArea(){

Also available in: Unified diff