From 63e98f6066c635cc691cb5400b76479e9e668702 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Thu, 7 Aug 2014 22:03:06 -0300 Subject: [PATCH 1/8] Extracting method to a better name --- .../main/java/br/com/caelum/vraptor/validator/Messages.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index 00cc51157..58011bdc8 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -21,7 +21,7 @@ public Messages add(Message message) { private List get(Severity severity) { if (!messages.containsKey(severity)) { - messages.put(severity, new MessageList(new ArrayList())); + messages.put(severity, createMessageList()); } return messages.get(severity); } @@ -37,4 +37,8 @@ public List getInfo() { public List getWarn() { return get(Severity.WARN); } + + private MessageList createMessageList() { + return new MessageList(new ArrayList()); + } } From 42a6d07da498ec55e8abdd42f9aa74f7a770bb1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Fri, 8 Aug 2014 17:00:57 -0300 Subject: [PATCH 2/8] Adding some docs about Messages class --- .../br/com/caelum/vraptor/validator/Messages.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index 58011bdc8..3dbaa3583 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -8,6 +8,19 @@ import javax.enterprise.context.RequestScoped; import javax.inject.Named; +/** + * Managed class that stores all application messages like errors, warnings and info. This + * class is useful to display messages categorized by severity in your view. To choose a severity + * you can construct your message like this: + * + * + * Message message = new SimpleMessage("name", "An info message", Severity.INFO); + * validation.add(message); // will stored as INFO severity + * + * + * @since 4.1 + * @author Otávio S Garcia + */ @Named @RequestScoped public class Messages { From 6e2e913ed27a61ddfcbe551591068bd0c7ae6523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Sat, 9 Aug 2014 15:33:42 -0300 Subject: [PATCH 3/8] Explaining how messages works --- .../main/java/br/com/caelum/vraptor/validator/MessageList.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/MessageList.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/MessageList.java index d78667f4f..352356647 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/MessageList.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/MessageList.java @@ -28,7 +28,8 @@ import com.google.common.collect.ForwardingList; /** - * Class that represents an error list. + * Class that represents an message list, allowing to use methods + * to groupping message by category. * * @author Otávio Scherer Garcia */ From 640fa5f20d8598b64bc5cc80923b0729691f5c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Sat, 9 Aug 2014 15:34:03 -0300 Subject: [PATCH 4/8] Pluralizing warn to warnings --- .../src/main/java/br/com/caelum/vraptor/validator/Messages.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index 3dbaa3583..5e3f74b31 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -47,7 +47,7 @@ public List getInfo() { return get(Severity.INFO); } - public List getWarn() { + public List getWarnings() { return get(Severity.WARN); } From b477c5a862564e72d9fdeb627f5fc5c2e1a6d56f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Sat, 9 Aug 2014 16:57:19 -0300 Subject: [PATCH 5/8] Adding license --- .../br/com/caelum/vraptor/validator/Messages.java | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index 5e3f74b31..f04a6b774 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -1,3 +1,18 @@ +/*** + * Copyright (c) 2009 Caelum - www.caelum.com.br/opensource All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); you may not + * use this file except in compliance with the License. You may obtain a copy of + * the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ package br.com.caelum.vraptor.validator; import java.util.ArrayList; From 398c6204241cb6956cab2baddb1be24215d41928 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 12 Aug 2014 12:23:21 -0300 Subject: [PATCH 6/8] Adding method to get all messages --- .../java/br/com/caelum/vraptor/validator/Messages.java | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index f04a6b774..ea099acee 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -66,6 +66,15 @@ public List getWarnings() { return get(Severity.WARN); } + public List getAll() { + List allMessages = new ArrayList(); + allMessages.add(get(Severity.ERROR)); + allMessages.add(get(Severity.WARN)); + allMessages.add(get(Severity.INFO)); + + return new MessageList(all); + } + private MessageList createMessageList() { return new MessageList(new ArrayList()); } From 6ee8b0919d9a132e8389657896c6951bd7e10e2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 12 Aug 2014 14:33:43 -0300 Subject: [PATCH 7/8] Typo --- .../main/java/br/com/caelum/vraptor/validator/Messages.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index ea099acee..fb62cc881 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -68,9 +68,9 @@ public List getWarnings() { public List getAll() { List allMessages = new ArrayList(); - allMessages.add(get(Severity.ERROR)); - allMessages.add(get(Severity.WARN)); - allMessages.add(get(Severity.INFO)); + allMessages.addAll(get(Severity.ERROR)); + allMessages.addAll(get(Severity.WARN)); + allMessages.addAll(get(Severity.INFO)); return new MessageList(all); } From df331cfacaaa316e4a64516071dafa01440878de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ot=C3=A1vio=20Garcia?= Date: Tue, 12 Aug 2014 14:47:40 -0300 Subject: [PATCH 8/8] Typo variable --- .../src/main/java/br/com/caelum/vraptor/validator/Messages.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java index fb62cc881..cdddaa147 100644 --- a/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java +++ b/vraptor-core/src/main/java/br/com/caelum/vraptor/validator/Messages.java @@ -72,7 +72,7 @@ public List getAll() { allMessages.addAll(get(Severity.WARN)); allMessages.addAll(get(Severity.INFO)); - return new MessageList(all); + return new MessageList(allMessages); } private MessageList createMessageList() {