Updated Branches: refs/heads/master dc3372ee6 -> fdeef2897
WICKET-4878 keep CSS styling independent of message Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/fdeef289 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/fdeef289 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/fdeef289 Branch: refs/heads/master Commit: fdeef289741651cdca700d2fce34fc9d00bcfa66 Parents: dc3372e Author: svenmeier <[email protected]> Authored: Thu Nov 22 13:28:23 2012 +0100 Committer: svenmeier <[email protected]> Committed: Thu Nov 22 13:28:23 2012 +0100 ---------------------------------------------------------------------- .../wicket/markup/html/panel/FeedbackPanel.java | 25 ++------------ 1 files changed, 4 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/fdeef289/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java index 6ebee04..3ff96fb 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java @@ -33,8 +33,7 @@ import org.apache.wicket.markup.html.list.ListItem; import org.apache.wicket.markup.html.list.ListView; import org.apache.wicket.model.AbstractReadOnlyModel; import org.apache.wicket.model.IModel; -import org.apache.wicket.model.Model; -import org.apache.wicket.protocol.http.WebSession; +import org.apache.wicket.settings.IApplicationSettings; /** @@ -75,7 +74,7 @@ public class FeedbackPanel extends Panel implements IFeedback /** * WICKET-4258 Feedback messages might be cleared already. * - * @see WebSession#cleanupFeedbackMessages() + * @see IApplicationSettings#setFeedbackMessageCleanupFilter(org.apache.wicket.feedback.IFeedbackMessageFilter) */ @Override public FeedbackMessage getObject() @@ -95,27 +94,11 @@ public class FeedbackPanel extends Panel implements IFeedback @Override protected void populateItem(final ListItem<FeedbackMessage> listItem) { - final IModel<String> replacementModel = new Model<String>() - { - private static final long serialVersionUID = 1L; - - /** - * Returns feedbackPanel + the message level, eg 'feedbackPanelERROR'. This is used - * as the class of the li / span elements. - * - * @see org.apache.wicket.model.IModel#getObject() - */ - @Override - public String getObject() - { - return getCSSClass(listItem.getModelObject()); - } - }; - final FeedbackMessage message = listItem.getModelObject(); message.markRendered(); final Component label = newMessageDisplayComponent("message", message); - final AttributeModifier levelModifier = AttributeModifier.append("class", replacementModel); + final AttributeModifier levelModifier = AttributeModifier.append("class", + getCSSClass(message)); label.add(levelModifier); listItem.add(levelModifier); listItem.add(label);
