Author: mgrigorov
Date: Thu Dec 9 19:01:05 2010
New Revision: 1044090
URL: http://svn.apache.org/viewvc?rev=1044090&view=rev
Log:
WICKET-2986 Feedback messages should be String not Serializable.
Change all feedback level methods to receive paramater of type Serializable
instead of String.
#error() already had that.
Add #debug() and #fatal() to Session.
Modified:
wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java?rev=1044090&r1=1044089&r2=1044090&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java
(original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Component.java Thu Dec
9 19:01:05 2010
@@ -133,9 +133,8 @@ import org.slf4j.LoggerFactory;
*
* <li><b>Rendering </b>- A markup response is generated by the Component via
* {...@link Component#render()}, which calls subclass implementation code
contained in
- * {...@link org.apache.wicket.Component#onRender()}. Once this phase begins, a
- * Component becomes immutable. Attempts to alter the Component will result in
a
- * WicketRuntimeException.
+ * {...@link org.apache.wicket.Component#onRender()}. Once this phase begins,
a Component becomes
+ * immutable. Attempts to alter the Component will result in a
WicketRuntimeException.
*
* </ul>
*
@@ -172,9 +171,9 @@ import org.slf4j.LoggerFactory;
* Application Localizer for easy access in Components.
*
* <li><b>Style </b>- The style ("skin") for a component is available through
- * {...@link org.apache.wicket.Component#getStyle()}, which is equivalent to
getSession().getStyle(). Styles
- * are intended to give a particular look to a Component or Resource that is
independent of its
- * Locale. For example, a style might be a set of resources, including images
and markup files,
+ * {...@link org.apache.wicket.Component#getStyle()}, which is equivalent to
getSession().getStyle().
+ * Styles are intended to give a particular look to a Component or Resource
that is independent of
+ * its Locale. For example, a style might be a set of resources, including
images and markup files,
* which gives the design look of "ocean" to the user. If the Session's style
is set to "ocean" and
* these resources are given names suffixed with "_ocean", Wicket's resource
management logic will
* prefer these resources to other resources, such as default resources, which
are not as good of a
@@ -1167,7 +1166,7 @@ public abstract class Component
* @param message
* The feedback message
*/
- public final void debug(final String message)
+ public final void debug(final Serializable message)
{
Session.get().getFeedbackMessages().debug(this, message);
Session.get().dirty();
@@ -1270,7 +1269,7 @@ public abstract class Component
* @param message
* The feedback message
*/
- public final void fatal(final String message)
+ public final void fatal(final Serializable message)
{
Session.get().getFeedbackMessages().fatal(this, message);
Session.get().dirty();
@@ -2005,7 +2004,7 @@ public abstract class Component
* @param message
* The feedback message
*/
- public final void info(final String message)
+ public final void info(final Serializable message)
{
Session.get().getFeedbackMessages().info(this, message);
Session.get().dirty();
@@ -3071,7 +3070,7 @@ public abstract class Component
*
* @param page
* The response page
- *
+ *
* @see
RequestCycle#setResponsePage(org.apache.wicket.request.component.IRequestablePage)
*/
public final void setResponsePage(final Page page)
@@ -3324,7 +3323,7 @@ public abstract class Component
* @param message
* The feedback message
*/
- public final void warn(final String message)
+ public final void warn(final Serializable message)
{
Session.get().getFeedbackMessages().warn(this, message);
Session.get().dirty();
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java?rev=1044090&r1=1044089&r2=1044090&view=diff
==============================================================================
--- wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java (original)
+++ wicket/trunk/wicket/src/main/java/org/apache/wicket/Session.java Thu Dec 9
19:01:05 2010
@@ -283,12 +283,34 @@ public abstract class Session implements
* @param message
* The feedback message
*/
- public final void error(final String message)
+ public final void error(final Serializable message)
{
addFeedbackMessage(message, FeedbackMessage.ERROR);
}
/**
+ * Registers an fatal feedback message for this session
+ *
+ * @param message
+ * The feedback message
+ */
+ public final void fatal(final Serializable message)
+ {
+ addFeedbackMessage(message, FeedbackMessage.FATAL);
+ }
+
+ /**
+ * Registers an debug feedback message for this session
+ *
+ * @param message
+ * The feedback message
+ */
+ public final void debug(final Serializable message)
+ {
+ addFeedbackMessage(message, FeedbackMessage.DEBUG);
+ }
+
+ /**
* Get the application that is currently working with this session.
*
* @return Returns the application.
@@ -426,7 +448,7 @@ public abstract class Session implements
* @param message
* The feedback message
*/
- public final void info(final String message)
+ public final void info(final Serializable message)
{
addFeedbackMessage(message, FeedbackMessage.INFO);
}
@@ -587,7 +609,7 @@ public abstract class Session implements
* @param message
* The feedback message
*/
- public final void warn(final String message)
+ public final void warn(final Serializable message)
{
addFeedbackMessage(message, FeedbackMessage.WARNING);
}
@@ -599,7 +621,7 @@ public abstract class Session implements
* @param level
*
*/
- private void addFeedbackMessage(String message, int level)
+ private void addFeedbackMessage(Serializable message, int level)
{
getFeedbackMessages().add(null, message, level);
dirty();
