Project

General

Profile

« Previous | Next » 

Revision f4f3c705

Added by Andreas Kohlbecker about 5 years ago

ref #8160 CdmBeanItemContainerFactory as service bean to load entities only in readyOnly transactions to avoid unintendet flushing

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/registration/ListPresenter.java
39 39
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
40 40
import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;
41 41
import eu.etaxonomy.cdm.model.reference.Reference;
42
import eu.etaxonomy.cdm.vaadin.component.CdmBeanItemContainerFactory;
42
import eu.etaxonomy.cdm.service.CdmBeanItemContainerFactory;
43 43
import eu.etaxonomy.cdm.vaadin.component.registration.RegistrationItem;
44 44
import eu.etaxonomy.cdm.vaadin.event.EntityChangeEvent;
45 45
import eu.etaxonomy.cdm.vaadin.event.PagingEvent;
......
59 59
@ViewScope
60 60
public class ListPresenter extends AbstractPresenter<ListView> {
61 61

  
62
    /**
63
     *
64
     */
65 62
    private static final String REGISTRATION_LIST_PRESENTER_SEARCH_FILTER = "registration.listPresenter.searchFilter";
66 63

  
67 64
    private static final EnumSet<RegistrationStatus> inProgressStatus = EnumSet.of(
......
77 74
    @Autowired
78 75
    private IRegistrationWorkingSetService workingSetService;
79 76

  
77
    @Autowired
78
    protected CdmBeanItemContainerFactory cdmBeanItemContainerFactory;
79

  
80 80
    private Integer pageIndex = 0;
81 81
    private Integer pageSize = null;
82 82

  
......
108 108
            }
109 109
        }
110 110

  
111
        CdmBeanItemContainerFactory selectFieldFactory = new CdmBeanItemContainerFactory(getRepo());
112

  
113 111
        if(getView().getSubmitterFilter() != null){
114
            getView().getSubmitterFilter().setContainerDataSource(selectFieldFactory.buildBeanItemContainer(User.class));
112
            getView().getSubmitterFilter().setContainerDataSource(cdmBeanItemContainerFactory.buildBeanItemContainer(User.class));
115 113
            getView().getSubmitterFilter().setItemCaptionPropertyId("username");
116 114
        }
117 115

  
118 116
        List<UUID> typeDesignationStatusUUIDS = new ArrayList<>();
119 117
        typeDesignationStatusUUIDS.addAll(RegistrationTermLists.NAME_TYPE_DESIGNATION_STATUS_UUIDS());
120 118
        typeDesignationStatusUUIDS.addAll(RegistrationTermLists.SPECIMEN_TYPE_DESIGNATION_STATUS_UUIDS());
121
        BeanItemContainer<DefinedTermBase> buildTermItemContainer = selectFieldFactory.buildTermItemContainer(typeDesignationStatusUUIDS);
119
        BeanItemContainer<DefinedTermBase> buildTermItemContainer = cdmBeanItemContainerFactory.buildTermItemContainer(typeDesignationStatusUUIDS);
122 120
        buildTermItemContainer.addItem(NULL_TYPE_STATUS);
123 121
        getView().getStatusTypeFilter().setContainerDataSource(buildTermItemContainer);
124 122
        for(DefinedTermBase dt : buildTermItemContainer.getItemIds()){

Also available in: Unified diff