Revision 6e9595e7
Added by Patrick Plitzner almost 7 years ago
src/main/java/eu/etaxonomy/cdm/vaadin/view/distributionStatus/settings/SettingsPresenter.java | ||
---|---|---|
17 | 17 |
import com.vaadin.data.util.IndexedContainer; |
18 | 18 |
import com.vaadin.server.VaadinSession; |
19 | 19 |
|
20 |
import eu.etaxonomy.cdm.api.service.IClassificationService; |
|
21 |
import eu.etaxonomy.cdm.api.service.ITaxonNodeService; |
|
22 |
import eu.etaxonomy.cdm.api.service.ITermService; |
|
23 |
import eu.etaxonomy.cdm.api.service.IVocabularyService; |
|
24 | 20 |
import eu.etaxonomy.cdm.model.common.DefinedTermBase; |
25 | 21 |
import eu.etaxonomy.cdm.model.common.TermType; |
26 | 22 |
import eu.etaxonomy.cdm.model.common.TermVocabulary; |
... | ... | |
38 | 34 |
|
39 | 35 |
private Container distributionContainer; |
40 | 36 |
private Container distributionStatusContainer; |
41 |
private IVocabularyService vocabularyService; |
|
42 |
private ITermService termService; |
|
43 |
private ITaxonNodeService taxonNodeService; |
|
44 |
private IClassificationService classificationService; |
|
45 | 37 |
private UUID termUUID; |
46 | 38 |
|
47 | 39 |
|
48 | 40 |
|
49 | 41 |
public SettingsPresenter(){ |
50 |
taxonNodeService = CdmSpringContextHelper.getTaxonNodeService(); |
|
51 |
classificationService = CdmSpringContextHelper.getClassificationService(); |
|
52 | 42 |
Object selectedVocabularyUuidString = VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_SELECTED_VOCABULARY_UUID); |
53 | 43 |
if(selectedVocabularyUuidString!=null){ |
54 | 44 |
termUUID = UUID.fromString(selectedVocabularyUuidString.toString()); |
... | ... | |
60 | 50 |
public List<TaxonNode> getChosenTaxonNodes(){ |
61 | 51 |
List<UUID> nodeUuids = (List<UUID>) VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_TAXON_NODES_UUID); |
62 | 52 |
if(nodeUuids!=null){ |
63 |
return taxonNodeService.load(nodeUuids, null);
|
|
53 |
return CdmSpringContextHelper.getTaxonNodeService().load(nodeUuids, null);
|
|
64 | 54 |
} |
65 | 55 |
return Collections.emptyList(); |
66 | 56 |
} |
... | ... | |
68 | 58 |
public Classification getChosenClassification(){ |
69 | 59 |
UUID uuid = (UUID) VaadinSession.getCurrent().getAttribute(DistributionEditorUtil.SATTR_CLASSIFICATION); |
70 | 60 |
if(uuid!=null){ |
71 |
return classificationService.load(uuid);
|
|
61 |
return CdmSpringContextHelper.getClassificationService().load(uuid);
|
|
72 | 62 |
} |
73 | 63 |
return null; |
74 | 64 |
} |
75 | 65 |
|
76 | 66 |
public TermVocabulary getChosenArea(){ |
77 |
return vocabularyService.load(termUUID);
|
|
67 |
return CdmSpringContextHelper.getVocabularyService().load(termUUID);
|
|
78 | 68 |
} |
79 | 69 |
|
80 | 70 |
public Container getDistributionContainer() { |
81 | 71 |
return distributionContainer; |
82 | 72 |
} |
83 |
|
|
84 |
public void setDistributionContainer(Container distributionContainer) { |
|
85 |
this.distributionContainer = distributionContainer; |
|
86 |
} |
|
87 |
|
|
73 |
|
|
88 | 74 |
public Container getDistributionStatusContainer() { |
89 | 75 |
return distributionStatusContainer; |
90 | 76 |
} |
91 |
|
|
92 |
public void setDistributionStatusContainer(Container distributionStatusContainer) { |
|
93 |
this.distributionStatusContainer = distributionStatusContainer; |
|
94 |
} |
|
95 | 77 |
|
96 | 78 |
private List<TermVocabulary<DefinedTermBase>> getNamedAreaList() { |
97 |
vocabularyService = CdmSpringContextHelper.getVocabularyService(); |
|
98 |
List<TermVocabulary<DefinedTermBase>> termList = vocabularyService.findByTermType(TermType.NamedArea); |
|
99 |
//FIXME: is this necessary?? |
|
100 |
for (TermVocabulary<DefinedTermBase> termVocabulary : termList) { |
|
101 |
termVocabulary.setTitleCache(null); |
|
102 |
} |
|
79 |
List<TermVocabulary<DefinedTermBase>> termList = CdmSpringContextHelper.getVocabularyService().findByTermType(TermType.NamedArea, VOCABULARY_INIT_STRATEGY); |
|
103 | 80 |
return termList; |
104 | 81 |
} |
105 |
|
|
82 |
|
|
106 | 83 |
private List<DefinedTermBase<?>> getPresenceAbsenceVocabulary(){ |
107 |
termService = CdmSpringContextHelper.getTermService(); |
|
108 |
return termService.listByTermType(TermType.PresenceAbsenceTerm, null, null, null, DESCRIPTION_INIT_STRATEGY); |
|
84 |
return CdmSpringContextHelper.getTermService().listByTermType(TermType.PresenceAbsenceTerm, null, null, null, DESCRIPTION_INIT_STRATEGY); |
|
109 | 85 |
} |
110 | 86 |
|
111 |
protected static final List<String> DESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{
|
|
87 |
protected static final List<String> VOCABULARY_INIT_STRATEGY = Arrays.asList(new String []{
|
|
112 | 88 |
"$", |
113 |
"annotations", |
|
114 |
"markers", |
|
115 |
"sources.citation.authorship", |
|
116 |
"sources.nameUsedInSource", |
|
117 |
"media", |
|
89 |
"terms", |
|
90 |
"terms.*", |
|
91 |
}); |
|
92 |
|
|
93 |
protected static final List<String> DESCRIPTION_INIT_STRATEGY = Arrays.asList(new String []{ |
|
94 |
"$", |
|
95 |
"annotations", |
|
96 |
"markers", |
|
97 |
"sources.citation.authorship", |
|
98 |
"sources.nameUsedInSource", |
|
99 |
"media", |
|
118 | 100 |
}); |
119 | 101 |
|
120 | 102 |
} |
Also available in: Unified diff
Fix service handling and refresh problem for distribution table