Project

General

Profile

« Previous | Next » 

Revision 0caafa75

Added by Andreas Müller over 1 year ago

ref #10186 further remove ConversationHolder and cleanup

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/UseObjectStore.java
13 13
import org.eclipse.core.runtime.IProgressMonitor;
14 14
import org.eclipse.core.runtime.NullProgressMonitor;
15 15

  
16
import eu.etaxonomy.cdm.common.URI;
17 16
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
18 17
import eu.etaxonomy.cdm.api.service.ITermService;
19 18
import eu.etaxonomy.cdm.api.service.IVocabularyService;
19
import eu.etaxonomy.cdm.common.URI;
20 20
import eu.etaxonomy.cdm.model.common.MarkerType;
21 21
import eu.etaxonomy.cdm.model.description.Feature;
22 22
import eu.etaxonomy.cdm.model.description.State;
......
144 144
	}
145 145

  
146 146
	private static void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) {
147
		TermVocabulary<DefinedTerm> humanGroupVocabulary =  CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);
147
		TermVocabulary<DefinedTerm> humanGroupVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);
148 148
		if (humanGroupVocabulary == null){
149 149
			monitor.subTask("create human group vocabulary");
150 150
			URI termSourceUri = null;
......
171 171
	}
172 172

  
173 173
	private static void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
174
		TermVocabulary<DefinedTerm> plantPartVocabulary =  CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);
174
		TermVocabulary<DefinedTerm> plantPartVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);
175 175
		if (plantPartVocabulary == null){
176 176
			monitor.subTask("create plant part vocabulary");
177 177
			URI termSourceUri = null;
......
193 193
	}
194 194

  
195 195
	private static void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
196
		TermVocabulary<DefinedTerm> countryVocabulary =  CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);
196
		TermVocabulary<DefinedTerm> countryVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);
197 197
		if (countryVocabulary == null){
198 198
			monitor.subTask("create country vocabulary");
199 199
			URI termSourceUri = null;
......
215 215
	}
216 216

  
217 217
	private static void createStateVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {
218
		TermVocabulary<State> stateVocabulary =  CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary);
218
		TermVocabulary<State> stateVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary);
219 219
		if (stateVocabulary == null){
220 220
			monitor.subTask("create state vocabulary");
221 221
			URI termSourceUri = null;

Also available in: Unified diff