Project

General

Profile

« Previous | Next » 

Revision b43aa785

Added by Katja Luther about 4 years ago

fix #8925: add userHelper() method to avoid redundancy

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java
27 27
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
28 28
import eu.etaxonomy.cdm.api.utility.CdmUserHelper;
29 29
import eu.etaxonomy.cdm.api.utility.RoleProber;
30
import eu.etaxonomy.cdm.api.utility.UserHelper;
30 31
import eu.etaxonomy.cdm.model.permission.Group;
31 32
import eu.etaxonomy.cdm.model.permission.User;
32 33
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
......
59 60

  
60 61
	}
61 62

  
63
	private UserHelper userHelper() {
64

  
65
        if (userHelper == null){
66
            userHelper = new CdmUserHelper();
67
        }
68
        return userHelper;
69
	}
70

  
62 71
	/**
63 72
	 * <p>authenticate</p>
64 73
	 *
......
171 180
	 * @return
172 181
	 */
173 182
	public boolean isAdmin() {
174
	    if (userHelper == null){
175
	        userHelper = new CdmUserHelper();
176
	    }
177
	    boolean result = userHelper.userIs(new RoleProber(Role.ROLE_ADMIN));
183
	    boolean result = userHelper().userIs(new RoleProber(Role.ROLE_ADMIN));
178 184
        return result;
179 185
	}
180 186

  
......
184 190
     * @return
185 191
     */
186 192
    public boolean isUserManager() {
187
        if (userHelper == null){
188
            userHelper = new CdmUserHelper();
189
        }
190
        boolean result = userHelper.userIs(new RoleProber(Role.ROLE_USER_MANAGER));
193
        boolean result = userHelper().userIs(new RoleProber(Role.ROLE_USER_MANAGER));
191 194
        return result;
192 195
    }
193 196

  

Also available in: Unified diff