Revision a735bbbf
Added by Andreas Kohlbecker about 7 years ago
- ID a735bbbfccc284e24f355551d2496cd15e790243
- Parent a1dac6b2
| src/main/java/eu/etaxonomy/cdm/vaadin/servlet/CdmVaadinConversationalServlet.java | ||
|---|---|---|
| 14 | 14 |
import javax.servlet.ServletException; |
| 15 | 15 |
|
| 16 | 16 |
import org.apache.log4j.Logger; |
| 17 |
import org.springframework.web.context.WebApplicationContext; |
|
| 18 |
import org.springframework.web.context.support.WebApplicationContextUtils; |
|
| 17 | 19 |
|
| 18 | 20 |
import com.vaadin.server.ServiceException; |
| 19 | 21 |
import com.vaadin.server.SessionDestroyEvent; |
| ... | ... | |
| 24 | 26 |
import com.vaadin.spring.server.SpringVaadinServlet; |
| 25 | 27 |
|
| 26 | 28 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
| 27 |
import eu.etaxonomy.cdm.vaadin.util.CdmSpringContextHelper; |
|
| 28 | 29 |
import eu.etaxonomy.cdm.vaadin.util.DistributionEditorUtil; |
| 29 | 30 |
|
| 30 | 31 |
|
| ... | ... | |
| 63 | 64 |
@Override |
| 64 | 65 |
public void sessionInit(SessionInitEvent event) |
| 65 | 66 |
throws ServiceException {
|
| 66 |
conversation = (ConversationHolder) CdmSpringContextHelper.getCurrent().getBean("conversationHolder");
|
|
| 67 |
WebApplicationContext webApplicationContext = WebApplicationContextUtils.getWebApplicationContext(getServletContext()); |
|
| 68 |
conversation = webApplicationContext.getBean(ConversationHolder.class); |
|
| 67 | 69 |
conversation.bind(); |
| 68 | 70 |
VaadinSession.getCurrent().setAttribute(DistributionEditorUtil.SATTR_CONVERSATION, conversation); |
| 69 | 71 |
} |
Also available in: Unified diff
ref #5285 attempt to avoid using the CdmSpringContextHelper
using DI to get rid of CdmSpringContextHelper, but got stuck due to the complexity and variety of the 'design patterns' that have been used.