Project

General

Profile

« Previous | Next » 

Revision d9a042e5

Added by Andreas Müller almost 2 years ago

ref #10089 rename TypeDesignationWorkingSet to TypeDesignationSet in vaadin

View differences:

src/main/java/eu/etaxonomy/cdm/vaadin/view/name/NameTypeDesignationPresenter.java
75 75

  
76 76
    private static final long serialVersionUID = 896305051895903033L;
77 77

  
78
    public static final Logger logger = Logger.getLogger(SpecimenTypeDesignationWorkingsetEditorPresenter.class);
78
    public static final Logger logger = Logger.getLogger(NameTypeDesignationPresenter.class);
79 79

  
80 80
    private HashSet<TaxonName> typifiedNamesAsLoaded;
81 81

  
......
109 109
    protected NameTypeDesignation loadBeanById(Object identifier) {
110 110
        NameTypeDesignation bean;
111 111

  
112
        NameTypeDesignationWorkingsetIds idset = (NameTypeDesignationWorkingsetIds)identifier;
112
        NameTypeDesignationSetIds idset = (NameTypeDesignationSetIds)identifier;
113 113

  
114 114
        if(idset.isForNewTypeDesignation()) {
115 115
            Reference reference = getRepo().getReferenceService().load(idset.getPublishedUnitUuid());
116 116
            try {
117 117
                setPublishedUnit(NamedSource.NewPrimarySourceInstance(reference, null));
118 118
            } catch(Exception e) {
119
                throw new RuntimeException("Reference of invalid type passed via NameTypeDesignationWorkingsetIds as publishedUnitUuid ", e);
119
                throw new RuntimeException("Reference of invalid type passed via NameTypeDesignationSetIds as publishedUnitUuid ", e);
120 120
            }
121 121
            EntityInitStrategy initstrategy = RegistrationWorkingSetService.NAME_INIT_STRATEGY
122 122
                    .clone()
......
127 127
            bean = super.loadBeanById(idset.getBaseEntity().getUuid());
128 128
            // TODO prevent from errors due to inconsistent data, two options:
129 129
            // 1. handle error condition here
130
            // 2. always set typifiedNameUuid in NameTypeDesignationWorkingsetIds
130
            // 2. always set typifiedNameUuid in NameTypeDesignationSetIds
131 131
            typifiedNameInContext = bean.getTypifiedNames().iterator().next();
132 132
            try {
133 133
                setPublishedUnit(bean.getTypifiedNames().iterator().next().getNomenclaturalSource());

Also available in: Unified diff