From 9eee0e951609616dbcc8269835ac1ceadaf27e1c Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 24 Nov 2010 19:33:03 +0000 Subject: [PATCH] NIHVIVO-1396 Change LoginProcessBean so the message is "read-once and clear". Change the method names to reflect this. --- .../controller/login/LoginProcessBean.java | 18 ++++++++++-------- .../controller/login/LoginTemplateHelper.java | 6 +++--- .../vitro/webapp/web/widgets/LoginWidget.java | 6 +++--- .../controller/edit/AuthenticateTest.java | 4 ++-- 4 files changed, 18 insertions(+), 16 deletions(-) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java index 749579dc9..4c21c830a 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginProcessBean.java @@ -188,20 +188,22 @@ public class LoginProcessBean { this.messageArguments = args; } - public String getInfoMessage() { + public String getInfoMessageAndClear() { + String text = ""; if (message.getMessageLevel() == MLevel.INFO) { - return message.formatMessage(messageArguments); - } else { - return ""; + text = message.formatMessage(messageArguments); + clearMessage(); } + return text; } - public String getErrorMessage() { + public String getErrorMessageAndClear() { + String text = ""; if (message.getMessageLevel() == MLevel.ERROR) { - return message.formatMessage(messageArguments); - } else { - return ""; + text = message.formatMessage(messageArguments); + clearMessage(); } + return text; } public String getUsername() { diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java index 19d8961c4..05e238ded 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/controller/login/LoginTemplateHelper.java @@ -108,11 +108,11 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase { trv.put(BODY_FORM_ACTION, getAuthenticateUrl(vreq)); trv.put(BODY_LOGIN_NAME, bean.getUsername()); - String infoMessage = bean.getInfoMessage(); + String infoMessage = bean.getInfoMessageAndClear(); if (!infoMessage.isEmpty()) { trv.put(BODY_INFO_MESSAGE, infoMessage); } - String errorMessage = bean.getErrorMessage(); + String errorMessage = bean.getErrorMessageAndClear(); if (!errorMessage.isEmpty()) { trv.put(BODY_ERROR_MESSAGE, errorMessage); } @@ -134,7 +134,7 @@ public class LoginTemplateHelper extends LoginTemplateHelperBase { trv.put(BODY_FORM_ACTION, getAuthenticateUrl(vreq)); trv.put(BODY_CANCEL_URL, getCancelUrl(vreq)); - String errorMessage = bean.getErrorMessage(); + String errorMessage = bean.getErrorMessageAndClear(); if (!errorMessage.isEmpty()) { trv.put(BODY_ERROR_MESSAGE, errorMessage); } diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java index 2285a9c04..acf8a0c9e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/web/widgets/LoginWidget.java @@ -128,11 +128,11 @@ public class LoginWidget extends Widget { externalAuthDisplayName); } - String infoMessage = bean.getInfoMessage(); + String infoMessage = bean.getInfoMessageAndClear(); if (!infoMessage.isEmpty()) { values.put(TemplateVariable.INFO_MESSAGE.toString(), infoMessage); } - String errorMessage = bean.getErrorMessage(); + String errorMessage = bean.getErrorMessageAndClear(); if (!errorMessage.isEmpty()) { values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage); } @@ -158,7 +158,7 @@ public class LoginWidget extends Widget { values.put(TemplateVariable.FORM_ACTION.toString(), getAuthenticateUrl(request)); values.put(TemplateVariable.CANCEL_URL.toString(), getCancelUrl(request)); - String errorMessage = bean.getErrorMessage(); + String errorMessage = bean.getErrorMessageAndClear(); if (!errorMessage.isEmpty()) { values.put(TemplateVariable.ERROR_MESSAGE.toString(), errorMessage); } diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java index f0ab2968b..fc56485e6 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/controller/edit/AuthenticateTest.java @@ -383,8 +383,8 @@ public class AuthenticateTest extends AbstractTestClass { } LoginProcessBean bean = LoginProcessBean.getBean(request); assertEquals("state", state, bean.getState()); - assertEquals("info message", infoMessage, bean.getInfoMessage()); - assertEquals("error message", errorMessage, bean.getErrorMessage()); + assertEquals("info message", infoMessage, bean.getInfoMessageAndClear()); + assertEquals("error message", errorMessage, bean.getErrorMessageAndClear()); assertEquals("username", username, bean.getUsername()); }