Project

General

Profile

« Previous | Next » 

Revision a735bbbf

Added by Andreas Kohlbecker about 7 years ago

  • ID a735bbbfccc284e24f355551d2496cd15e790243
  • Parent a1dac6b2

ref #5285 attempt to avoid using the CdmSpringContextHelper
using DI to get rid of CdmSpringContextHelper, but got stuck due to the complexity and variety of the 'design patterns' that have been used.

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/presenter/dbstatus/DistributionTablePresenter.java
11 11
import java.util.Set;
12 12
import java.util.UUID;
13 13

  
14
import org.springframework.beans.factory.annotation.Autowired;
15

  
14 16
import com.vaadin.server.VaadinSession;
15 17
import com.vaadin.ui.Notification;
16 18

  
19
import eu.etaxonomy.cdm.api.application.CdmRepository;
17 20
import eu.etaxonomy.cdm.api.service.IClassificationService;
18 21
import eu.etaxonomy.cdm.api.service.IDescriptionService;
19 22
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
......
36 39
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
37 40
import eu.etaxonomy.cdm.vaadin.container.CdmSQLContainer;
38 41
import eu.etaxonomy.cdm.vaadin.util.CdmQueryFactory;
39
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper;
40 42
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil;
41 43
import eu.etaxonomy.cdm.vaadin.view.dbstatus.DistributionTableView;
42 44

  
43 45

  
44 46
public class DistributionTablePresenter {
45 47

  
48
    @Autowired
49
    private CdmRepository cdmRepo = null;
50

  
46 51
    private final IClassificationService classificationService;
47 52
	private final IVocabularyService vocabularyService;
48 53
	private final IDescriptionService descriptionService;
49 54
	private final ITaxonNodeService taxonNodeService;
50 55
	private final ITermService termService;
51
	private final DistributionTableView view;
52 56
	private final ITaxonService taxonService;
53 57

  
54 58
	public DistributionTablePresenter(DistributionTableView dtv){
55
	    this.view = dtv;
56
	    view.addListener(this);
57
	    taxonService = CdmSpringContextHelper.getTaxonService();
58
	    classificationService = CdmSpringContextHelper.getClassificationService();
59
	    taxonNodeService = CdmSpringContextHelper.getTaxonNodeService();
60
		vocabularyService = CdmSpringContextHelper.getVocabularyService();
61
		descriptionService = CdmSpringContextHelper.getDescriptionService();
62
		termService = CdmSpringContextHelper.getTermService();
59

  
60
	    taxonService = cdmRepo.getTaxonService();
61
	    classificationService = cdmRepo.getClassificationService();
62
	    taxonNodeService = cdmRepo.getTaxonNodeService();
63
		vocabularyService = cdmRepo.getVocabularyService();
64
		descriptionService = cdmRepo.getDescriptionService();
65
		termService = cdmRepo.getTermService();
63 66
	}
64 67

  
65 68
    public int updateDistributionField(String distributionAreaString, Object comboValue, Taxon taxon) {

Also available in: Unified diff