Project

General

Profile

« Previous | Next » 

Revision 85ddc538

Added by Andreas Kohlbecker about 6 years ago

fix #7207 NomenclaturalTitle, Collector titel and bibliographic title for TeamOrPersonField

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/component/common/TeamOrPersonField.java
34 34
import eu.etaxonomy.cdm.service.CdmFilterablePagingProvider;
35 35
import eu.etaxonomy.cdm.vaadin.event.ToOneRelatedEntityReloader;
36 36
import eu.etaxonomy.cdm.vaadin.security.UserHelper;
37
import eu.etaxonomy.cdm.vaadin.util.CdmTitleCacheCaptionGenerator;
37
import eu.etaxonomy.cdm.vaadin.util.TeamOrPersonBaseCaptionGenerator;
38 38
import eu.etaxonomy.cdm.vaadin.util.converter.CdmBaseDeproxyConverter;
39 39
import eu.etaxonomy.cdm.vaadin.view.name.CachingPresenter;
40 40
import eu.etaxonomy.vaadin.component.CompositeCustomField;
41 41
import eu.etaxonomy.vaadin.component.EntityFieldInstantiator;
42
import eu.etaxonomy.vaadin.component.ReloadableLazyComboBox;
42 43
import eu.etaxonomy.vaadin.component.SwitchableTextField;
43 44
import eu.etaxonomy.vaadin.component.ToManyRelatedEntitiesListSelect;
44 45

  
......
57 58
    private CssLayout toolBar= new CssLayout();
58 59
    private CssLayout compositeWrapper = new CssLayout();
59 60

  
60
    private LazyComboBox<TeamOrPersonBase> teamOrPersonSelect = new LazyComboBox<TeamOrPersonBase>(TeamOrPersonBase.class);
61
    private ReloadableLazyComboBox<TeamOrPersonBase> teamOrPersonSelect = new ReloadableLazyComboBox<TeamOrPersonBase>(TeamOrPersonBase.class);
61 62

  
62 63
    private Button selectConfirmButton = new Button("OK");
63 64
    private Button removeButton = new Button(FontAwesome.REMOVE);
......
76 77

  
77 78
    private CdmFilterablePagingProvider<AgentBase, Person> pagingProviderPerson;
78 79

  
79
    public TeamOrPersonField(String caption){
80
    private TeamOrPersonBaseCaptionGenerator.CacheType cacheType;
81

  
82
    public TeamOrPersonField(String caption, TeamOrPersonBaseCaptionGenerator.CacheType cacheType){
80 83

  
81 84
        setCaption(caption);
82 85

  
83
        teamOrPersonSelect.setCaptionGenerator(new CdmTitleCacheCaptionGenerator<TeamOrPersonBase>());
86
        this.cacheType = cacheType;
87
        teamOrPersonSelect.setCaptionGenerator(new TeamOrPersonBaseCaptionGenerator<TeamOrPersonBase>(cacheType));
84 88

  
85 89

  
86 90
        addStyledComponent(teamOrPersonSelect);
......
329 333
                PersonField f = new PersonField();
330 334
                f.setAllowNewEmptyEntity(true); // otherwise new entities can not be added to the personsListEditor
331 335
                f.getPersonSelect().loadFrom(pagingProvider, pagingProvider, pagingProvider.getPageSize());
332
                f.getPersonSelect().setCaptionGenerator(new CdmTitleCacheCaptionGenerator<Person>());
336
                f.getPersonSelect().setCaptionGenerator(new TeamOrPersonBaseCaptionGenerator<Person>(cacheType));
333 337
                f.getPersonSelect().addValueChangeListener(new ToOneRelatedEntityReloader<Person>(f.getPersonSelect(), cachingPresenter));
334 338
                return f;
335 339
            }

Also available in: Unified diff