Revision e8674a36
Added by Andreas Kohlbecker about 6 years ago
| src/main/java/eu/etaxonomy/cdm/service/CdmStore.java | ||
|---|---|---|
| 24 | 24 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
| 25 | 25 |
import eu.etaxonomy.cdm.vaadin.event.EntityChangeEvent; |
| 26 | 26 |
import eu.etaxonomy.cdm.vaadin.event.EntityChangeEvent.Type; |
| 27 |
import eu.etaxonomy.vaadin.mvp.AbstractView; |
|
| 27 | 28 |
|
| 28 | 29 |
/** |
| 29 | 30 |
* @author a.kohlbecker |
| ... | ... | |
| 176 | 177 |
/** |
| 177 | 178 |
* |
| 178 | 179 |
* @param bean |
| 179 |
*
|
|
| 180 |
* |
|
| 180 | 181 |
* @return the merged bean, this bean is <b>not reloaded</b> from the |
| 181 | 182 |
* persistent storage. |
| 182 | 183 |
*/ |
| 183 |
public EntityChangeEvent saveBean(T bean) {
|
|
| 184 |
public EntityChangeEvent saveBean(T bean, AbstractView view) {
|
|
| 184 | 185 |
|
| 185 | 186 |
Type changeEventType; |
| 186 | 187 |
if(bean.getId() > 1){
|
| ... | ... | |
| 209 | 210 |
session.flush(); |
| 210 | 211 |
commitTransction(); |
| 211 | 212 |
|
| 212 |
return new EntityChangeEvent(mergedBean.getClass(), mergedBean.getId(), changeEventType); |
|
| 213 |
return new EntityChangeEvent(mergedBean.getClass(), mergedBean.getId(), changeEventType, view);
|
|
| 213 | 214 |
} |
| 214 | 215 |
|
| 215 | 216 |
/** |
| ... | ... | |
| 217 | 218 |
* @param bean |
| 218 | 219 |
* @return a EntityChangeEvent in case the deletion was successful otherwise <code>null</code>. |
| 219 | 220 |
*/ |
| 220 |
public final EntityChangeEvent deleteBean(T bean) {
|
|
| 221 |
public final EntityChangeEvent deleteBean(T bean, AbstractView view) {
|
|
| 221 | 222 |
|
| 222 | 223 |
logger.trace(this._toString() + ".onEditorPreSaveEvent - starting transaction"); |
| 223 | 224 |
|
| ... | ... | |
| 229 | 230 |
getSession().flush(); |
| 230 | 231 |
commitTransction(); |
| 231 | 232 |
logger.trace(this._toString() + ".deleteBean - transaction comitted"); |
| 232 |
return new EntityChangeEvent(bean.getClass(), bean.getId(), Type.REMOVED); |
|
| 233 |
return new EntityChangeEvent(bean.getClass(), bean.getId(), Type.REMOVED, view);
|
|
| 233 | 234 |
} else {
|
| 234 | 235 |
String notificationTitle; |
| 235 | 236 |
StringBuffer messageBody = new StringBuffer(); |
Also available in: Unified diff
ref #7195 introducing the concept of EditorActionContext stacks to facilitate creating blocking relations