Revision 5b7fa02a
Added by Andreas Kohlbecker over 5 years ago
| src/main/java/eu/etaxonomy/vaadin/ui/navigation/NavigationManagerBean.java | ||
|---|---|---|
| 6 | 6 |
|
| 7 | 7 |
import org.apache.commons.lang3.StringUtils; |
| 8 | 8 |
import org.apache.log4j.Logger; |
| 9 |
import org.springframework.beans.factory.DisposableBean; |
|
| 9 | 10 |
import org.springframework.beans.factory.annotation.Autowired; |
| 10 | 11 |
import org.springframework.context.ApplicationContext; |
| 11 | 12 |
import org.springframework.context.annotation.Lazy; |
| ... | ... | |
| 194 | 195 |
} |
| 195 | 196 |
|
| 196 | 197 |
@EventBusListenerMethod |
| 197 |
protected void onDoneWithTheEditor(DoneWithPopupEvent e) {
|
|
| 198 |
|
|
| 199 |
PopupView popup = e.getPopup(); |
|
| 198 |
protected void onDoneWithTheEditor(DoneWithPopupEvent event) {
|
|
| 199 |
|
|
| 200 |
PopupView popup = event.getPopup(); |
|
| 201 |
if(DisposableBean.class.isAssignableFrom(popup.getClass())){
|
|
| 202 |
try {
|
|
| 203 |
((DisposableBean)popup).destroy(); |
|
| 204 |
} catch (Exception e) {
|
|
| 205 |
logger.error(e); |
|
| 206 |
} |
|
| 207 |
} |
|
| 200 | 208 |
Window window = popupViewRegistration.getWindow(popup); |
| 201 | 209 |
if (window != null) {
|
| 202 | 210 |
window.close(); |
Also available in: Unified diff
fix #7742 disposing view, presenter and ehcaches when popupviews are closed