Project

General

Profile

« Previous | Next » 

Revision 49d3c2dd

Added by Katja Luther over 1 year ago

ref #10186: remove conversation holder

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
22 22
import org.springframework.security.core.context.SecurityContextHolder;
23 23

  
24 24
import eu.etaxonomy.cdm.api.application.CdmApplicationState;
25
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
26
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
27 25
import eu.etaxonomy.cdm.api.util.CdmUserHelper;
28 26
import eu.etaxonomy.cdm.api.util.RoleProberImpl;
29 27
import eu.etaxonomy.cdm.api.util.UserHelper;
......
41 39
 * @created 03.07.2009
42 40
 * @version 1.0
43 41
 */
44
public class LoginManager extends Observable implements IConversationEnabled, IContextListener{
42
public class LoginManager extends Observable implements IContextListener{
45 43

  
46 44
	public static final Logger logger = LogManager.getLogger(LoginManager.class);
47 45

  
48
	private ConversationHolder conversation;
46
//	private ConversationHolder conversation;
49 47

  
50 48
	public static final String INCORRECT_CREDENTIALS_MESSAGE = "Login and/or Password incorrect";
51 49
	public static final String ACCOUNT_LOCKED_MESSAGE = "Account is locked";
......
156 154
		notifyObservers();
157 155
	}
158 156

  
159
	/* (non-Javadoc)
160
	 * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
161
	 */
162
	@Override
163
	public void update(CdmDataChangeMap arg) {}
164

  
165
	/* (non-Javadoc)
166
	 * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
167
	 */
168
	@Override
169
	public ConversationHolder getConversationHolder() {
170
		if(conversation == null){
171
			conversation = CdmStore.createConversation();
172
		}
173
		return conversation;
174
	}
175

  
157
	
176 158
	/**
177 159
	 * Whether the current user has the role admin
178 160
	 *
......
205 187

  
206 188
	@Override
207 189
	public void contextStart(IMemento memento, IProgressMonitor monitor){
208
		conversation = CdmStore.createConversation();
190
		//conversation = CdmStore.createConversation();
209 191
	}
210 192

  
211 193
	@Override
212 194
	public void contextRefresh(IProgressMonitor monitor) {
213
		conversation = CdmStore.createConversation();
195
		//conversation = CdmStore.createConversation();
214 196
	}
215 197

  
216 198
	@Override

Also available in: Unified diff