This is an automated email from the git hooks/post-receive script. New commit to branch pollen-udpate-1.6 in repository pollen_1.x. See http://git.chorem.org/pollen_1.x.git commit c4cffda45f9d7f3210c22b6c16571fda0ce609e2 Author: Eric Chatellier <eric.chatellier@gmail.com> Date: Wed Nov 18 21:22:40 2015 +0100 Fix deprecated method --- .../src/main/java/org/chorem/pollen/ui/PollenUIUtils.java | 10 +++++----- .../java/org/chorem/pollen/ui/converters/DateConverter.java | 8 ++++---- .../pollen/ui/security/AbstractPollenAuthorization.java | 12 ++++++------ .../chorem/pollen/ui/security/PollCreatorAccessRequired.java | 8 ++++---- .../chorem/pollen/ui/security/PollResultAccessRequired.java | 6 +++--- .../chorem/pollen/ui/security/PollVoteAccessRequired.java | 6 +++--- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java index c58084f..88cea41 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2015 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import java.util.Locale; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Useful ui methods. @@ -68,11 +68,11 @@ public class PollenUIUtils { int i = poll.sizeVote(); String result; if (i == 0) { - result = l_(locale, "pollen.common.voteNoVote"); + result = l(locale, "pollen.common.voteNoVote"); } else if (i == 1) { - result = l_(locale, "pollen.common.voteOneVote"); + result = l(locale, "pollen.common.voteOneVote"); } else { - result = l_(locale, "pollen.common.voteNbVotes", i); + result = l(locale, "pollen.common.voteNbVotes", i); } return result; } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java index 3e4b030..9377452 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/converters/DateConverter.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2015 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -34,7 +34,7 @@ import java.util.Date; import java.util.Locale; import java.util.Map; -import static org.nuiton.i18n.I18n.l_; +import static org.nuiton.i18n.I18n.l; /** * Created: 18/04/12 @@ -88,13 +88,13 @@ public class DateConverter extends StrutsTypeConverter { private static String getDateTimePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.dateTimePattern"); + String result = l(locale, "pollen.common.dateTimePattern"); return result; } private static String getDatePattern() { Locale locale = ActionContext.getContext().getLocale(); - String result = l_(locale, "pollen.common.datePattern"); + String result = l(locale, "pollen.common.datePattern"); return result; } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java index 35d0a2e..d00f310 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit + * Copyright (C) 2009 - 2015 CodeLutin, Tony Chemit * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -22,7 +22,7 @@ */ package org.chorem.pollen.ui.security; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; import java.io.IOException; import java.util.Locale; @@ -123,14 +123,14 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (pollUri == null) { // no pollUri in url - errorMessage = n_("pollen.security.error.no.pollId"); + errorMessage = n("pollen.security.error.no.pollId"); } else { if (!pollUri.isPollIdNotBlank()) { // no pollId in uri - errorMessage = n_("pollen.security.error.no.pollId"); + errorMessage = n("pollen.security.error.no.pollId"); } else { // there is a pollId check that it exists @@ -143,7 +143,7 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (poll == null) { // poll not found - errorMessage = n_("pollen.security.error.poll.not.found"); + errorMessage = n("pollen.security.error.poll.not.found"); } if (log.isDebugEnabled()) { @@ -171,7 +171,7 @@ public abstract class AbstractPollenAuthorization extends AuthorizationFilter { if (!accountExist) { // bad accountId - errorMessage = n_("pollen.security.error.bad.accountId"); + errorMessage = n("pollen.security.error.bad.accountId"); registerError(request, errorMessage); } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java index cf94184..bf5d68d 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollCreatorAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -28,7 +28,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can show results of a poll. @@ -61,7 +61,7 @@ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { // bad accountId isAccessAllowed = false; registerError( - request, n_("pollen.security.error.bad.accountId")); + request, n("pollen.security.error.bad.accountId")); } } } @@ -79,7 +79,7 @@ public class PollCreatorAccessRequired extends AbstractPollenAuthorization { isAccessAllowed = false; registerError( request, - n_("pollen.security.error.creatorId.or.admin.required")); + n("pollen.security.error.creatorId.or.admin.required")); } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java index 6e0aec4..3c7f627 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollResultAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can show results of a poll. @@ -63,7 +63,7 @@ public class PollResultAccessRequired extends AbstractPollenAuthorization { isAccessAllowed = false; registerError( request, - n_("pollen.security.error.bad.accountId")); + n("pollen.security.error.bad.accountId")); } } } diff --git a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java index b2fd002..92e294b 100644 --- a/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java +++ b/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/PollVoteAccessRequired.java @@ -4,7 +4,7 @@ * $Id$ * $HeadURL$ * %% - * Copyright (C) 2009 - 2012 CodeLutin + * Copyright (C) 2009 - 2015 CodeLutin * %% * This program is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by @@ -29,7 +29,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import static org.nuiton.i18n.I18n.n_; +import static org.nuiton.i18n.I18n.n; /** * Check that a user can vote. @@ -61,7 +61,7 @@ public class PollVoteAccessRequired extends AbstractPollenAuthorization { // bad accountId isAccessAllowed = false; registerError(request, - n_("pollen.security.error.bad.accountId")); + n("pollen.security.error.bad.accountId")); } } } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.