Subversion Repositories general

Compare Revisions

Ignore whitespace Rev 1038 → Rev 1057

/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/LocaleOptionsTag.java
12,11 → 12,12
 
import ak.hostadmiral.core.Locales;
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public class LocaleOptionsTag extends OptionsTag
{
protected static MessageResources coreMessages =
MessageResources.getMessageResources("ak.hostadmiral.core.CoreResources");
protected static MessageResources pageMessages =
MessageResources.getMessageResources("ak.hostadmiral.core.resources.PageMessages");
 
public int doEndTag() throws JspException
{
25,7 → 26,7
throw new JspException(messages.getMessage("optionsTag.select"));
}
 
User user = (User)pageContext.getSession().getAttribute("user");
User user = (User)pageContext.getSession().getAttribute(SessionKeys.USER);
if(user == null) throw new JspException("no user found");
Locale userLocale = user.getLocale();
 
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/permission/RightTagBase.java
8,6 → 8,7
 
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.model.ModelObject;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public abstract class RightTagBase
extends TagSupport
37,7 → 38,7
public int doStartTag()
throws JspException
{
user = (User)RequestUtils.lookup(pageContext, "user", "session");
user = (User)RequestUtils.lookup(pageContext, SessionKeys.USER, "session");
 
Object obj = RequestUtils.lookup(pageContext, name, null);
if(obj == null)
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/CountryTag.java
5,6 → 5,7
import javax.servlet.jsp.tagext.TagSupport;
 
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public class CountryTag
extends TagSupport
12,7 → 13,7
public int doStartTag()
throws JspException
{
User user = (User)pageContext.getSession().getAttribute("user");
User user = (User)pageContext.getSession().getAttribute(SessionKeys.USER);
 
if(user == null)
throw new JspException("no user found");
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/LanguageTag.java
5,6 → 5,7
import javax.servlet.jsp.tagext.TagSupport;
 
import ak.hostadmiral.core.model.User;
import ak.hostadmiral.core.servlet.SessionKeys;
 
public class LanguageTag
extends TagSupport
12,7 → 13,7
public int doStartTag()
throws JspException
{
User user = (User)pageContext.getSession().getAttribute("user");
User user = (User)pageContext.getSession().getAttribute(SessionKeys.USER);
 
if(user == null)
throw new JspException("no user found");
/hostadmiral/trunk/src/ak/hostadmiral/core/taglib/ModelObjectOptionsTag.java
18,7 → 18,7
public class ModelObjectOptionsTag extends OptionsTag
{
protected static MessageResources coreMessages =
MessageResources.getMessageResources("ak.hostadmiral.core.CoreResources");
MessageResources.getMessageResources("ak.hostadmiral.core.resources.CoreMessages");
 
public int doEndTag() throws JspException
{