Author: pete
Date: Thu May 12 12:42:44 2011
New Revision: 1102266
URL: http://svn.apache.org/viewvc?rev=1102266&view=rev
Log:
reorder methods and fields so the make up categories + minor cleanup
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java?rev=1102266&r1=1102265&r2=1102266&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessage.java
Thu May 12 12:42:44 2011
@@ -21,7 +21,6 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.wicket.Component;
-import org.apache.wicket.IClusterable;
import org.apache.wicket.model.IDetachable;
@@ -31,31 +30,31 @@ import org.apache.wicket.model.IDetachab
* @author Eelco Hillenius
* @author Jonathan Locke
*/
-public class FeedbackMessage implements IClusterable, IDetachable
+public class FeedbackMessage implements IDetachable
{
private static final long serialVersionUID = 1L;
- /** Constant for debug level. */
- public static final int DEBUG = 100;
-
- /** Constant for error level. */
- public static final int ERROR = 400;
-
- /** Constant for fatal level. */
- public static final int FATAL = 500;
-
- /** Constant for info level. */
- public static final int INFO = 200;
-
/**
* Constant for an undefined level; note that components might decide
not to render anything
* when this level is used.
*/
public static final int UNDEFINED = 0;
+ /** Constant for debug level. */
+ public static final int DEBUG = 100;
+
+ /** Constant for info level. */
+ public static final int INFO = 200;
+
/** Constant for warning level. */
public static final int WARNING = 300;
+ /** Constant for error level. */
+ public static final int ERROR = 400;
+
+ /** Constant for fatal level. */
+ public static final int FATAL = 500;
+
/** Levels as strings for debugging. */
private static final Map<Integer, String> levelStrings = new
HashMap<Integer, String>();
@@ -178,6 +177,26 @@ public class FeedbackMessage implements
}
/**
+ * Gets whether the current level is INFO or up.
+ *
+ * @return whether the current level is INFO or up.
+ */
+ public final boolean isInfo()
+ {
+ return isLevel(INFO);
+ }
+
+ /**
+ * Gets whether the current level is WARNING or up.
+ *
+ * @return whether the current level is WARNING or up.
+ */
+ public final boolean isWarning()
+ {
+ return isLevel(WARNING);
+ }
+
+ /**
* Gets whether the current level is ERROR or up.
*
* @return whether the current level is ERROR or up.
@@ -198,16 +217,6 @@ public class FeedbackMessage implements
}
/**
- * Gets whether the current level is INFO or up.
- *
- * @return whether the current level is INFO or up.
- */
- public final boolean isInfo()
- {
- return isLevel(INFO);
- }
-
- /**
* Returns whether this level is greater than or equal to the given
level.
*
* @param level
@@ -230,16 +239,6 @@ public class FeedbackMessage implements
}
/**
- * Gets whether the current level is WARNING or up.
- *
- * @return whether the current level is WARNING or up.
- */
- public final boolean isWarning()
- {
- return isLevel(WARNING);
- }
-
- /**
* @see java.lang.Object#toString()
*/
@Override
@@ -247,7 +246,7 @@ public class FeedbackMessage implements
{
return "[FeedbackMessage message = \"" + getMessage() + "\",
reporter = " +
((getReporter() == null) ? "null" :
getReporter().getId()) + ", level = " +
- getLevelAsString() + "]";
+ getLevelAsString() + ']';
}
/** {@inheritDoc} */
Modified:
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
URL:
http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java?rev=1102266&r1=1102265&r2=1102266&view=diff
==============================================================================
---
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
(original)
+++
wicket/trunk/wicket-core/src/main/java/org/apache/wicket/feedback/FeedbackMessages.java
Thu May 12 12:42:44 2011
@@ -60,6 +60,21 @@ public final class FeedbackMessages impl
}
/**
+ * Adds a message.
+ *
+ * @param message
+ * the message
+ */
+ public final void add(FeedbackMessage message)
+ {
+ if (log.isDebugEnabled())
+ {
+ log.debug("Adding feedback message " + message);
+ }
+ messages.add(message);
+ }
+
+ /**
* Adds a message
*
* @param reporter
@@ -72,53 +87,42 @@ public final class FeedbackMessages impl
}
/**
- * Clears any existing messages.
+ * Adds a new ui message with level DEBUG to the current messages.
*
- * @return The number of messages deleted
+ * @param reporter
+ * the reporting component
+ * @param message
+ * the actual message
*/
- public final int clear()
+ public final void debug(Component reporter, Serializable message)
{
- return clear(null);
+ add(new FeedbackMessage(reporter, message,
FeedbackMessage.DEBUG));
}
/**
- * Clears all messages that are accepted by the filter.
+ * Adds a new ui message with level INFO to the current messages.
*
- * @param filter
- * Filter for selecting messages. If null, all messages will
be returned
- * @return The number of messages deleted
+ * @param reporter
+ * The reporting component
+ * @param message
+ * The actual message
*/
- public final int clear(final IFeedbackMessageFilter filter)
+ public final void info(Component reporter, Serializable message)
{
- if (messages.size() == 0)
- {
- return 0;
- }
-
- List<FeedbackMessage> toDelete = messages(filter);
-
-
- for (FeedbackMessage message : toDelete)
- {
- message.detach();
- }
-
- messages.removeAll(toDelete);
-
- return toDelete.size();
+ add(new FeedbackMessage(reporter, message,
FeedbackMessage.INFO));
}
/**
- * Adds a new ui message with level DEBUG to the current messages.
+ * Adds a new ui message with level WARNING to the current messages.
*
* @param reporter
* the reporting component
* @param message
* the actual message
*/
- public final void debug(Component reporter, Serializable message)
+ public final void warn(Component reporter, Serializable message)
{
- add(new FeedbackMessage(reporter, message,
FeedbackMessage.DEBUG));
+ add(new FeedbackMessage(reporter, message,
FeedbackMessage.WARNING));
}
/**
@@ -148,16 +152,40 @@ public final class FeedbackMessages impl
}
/**
- * Convenience method that looks up whether the given component
registered a message with this
- * list with the level ERROR.
+ * Clears any existing messages.
*
- * @param component
- * the component to look up whether it registered a message
- * @return whether the given component registered a message with this
list with level ERROR
+ * @return The number of messages deleted
*/
- public final boolean hasErrorMessageFor(Component component)
+ public final int clear()
{
- return hasMessageFor(component, FeedbackMessage.ERROR);
+ return clear(null);
+ }
+
+ /**
+ * Clears all messages that are accepted by the filter.
+ *
+ * @param filter
+ * Filter for selecting messages. If null, all messages will
be returned
+ * @return The number of messages deleted
+ */
+ public final int clear(final IFeedbackMessageFilter filter)
+ {
+ if (messages.isEmpty())
+ {
+ return 0;
+ }
+
+ List<FeedbackMessage> toDelete = messages(filter);
+
+
+ for (FeedbackMessage message : toDelete)
+ {
+ message.detach();
+ }
+
+ messages.removeAll(toDelete);
+
+ return toDelete.size();
}
/**
@@ -167,7 +195,7 @@ public final class FeedbackMessages impl
*/
public final boolean hasMessage(final IFeedbackMessageFilter filter)
{
- return messages(filter).size() != 0;
+ return messages(filter).isEmpty() == false;
}
/**
@@ -205,36 +233,51 @@ public final class FeedbackMessages impl
}
/**
- * Adds a new ui message with level INFO to the current messages.
+ * Convenience method that looks up whether the given component
registered a message with this
+ * list with the level ERROR.
*
- * @param reporter
- * The reporting component
- * @param message
- * The actual message
+ * @param component
+ * the component to look up whether it registered a message
+ * @return whether the given component registered a message with this
list with level ERROR
*/
- public final void info(Component reporter, Serializable message)
+ public final boolean hasErrorMessageFor(Component component)
{
- add(new FeedbackMessage(reporter, message,
FeedbackMessage.INFO));
+ return hasMessageFor(component, FeedbackMessage.ERROR);
}
/**
- * Gets whether there are no messages.
+ * Gets an iterator over stored messages
*
- * @return True when there are no messages
+ * @return iterator over stored messages
*/
- public final boolean isEmpty()
+ public final Iterator<FeedbackMessage> iterator()
{
- return messages.isEmpty();
+ return messages.iterator();
}
/**
- * Gets an iterator over stored messages
+ * Gets a list of messages from the page using a filter.
*
- * @return iterator over stored messages
+ * @param filter
+ * Filter for selecting messages. If null, all messages will
be returned
+ * @return The messages or an empty list if no messages are found
*/
- public final Iterator<FeedbackMessage> iterator()
+ public final List<FeedbackMessage> messages(final
IFeedbackMessageFilter filter)
{
- return messages.iterator();
+ if (messages.isEmpty())
+ {
+ return Collections.emptyList();
+ }
+
+ final List<FeedbackMessage> list = new
ArrayList<FeedbackMessage>();
+ for (final FeedbackMessage message : messages)
+ {
+ if (filter == null || filter.accept(message))
+ {
+ list.add(message);
+ }
+ }
+ return list;
}
/**
@@ -260,28 +303,13 @@ public final class FeedbackMessages impl
}
/**
- * Gets a list of messages from the page using a filter.
+ * Gets whether there are no messages.
*
- * @param filter
- * Filter for selecting messages. If null, all messages will
be returned
- * @return The messages or an empty list if no messages are found
+ * @return True when there are no messages
*/
- public final List<FeedbackMessage> messages(final
IFeedbackMessageFilter filter)
+ public final boolean isEmpty()
{
- if (messages.size() == 0)
- {
- return Collections.emptyList();
- }
-
- final List<FeedbackMessage> list = new
ArrayList<FeedbackMessage>();
- for (final FeedbackMessage message : messages)
- {
- if (filter == null || filter.accept(message))
- {
- list.add(message);
- }
- }
- return list;
+ return messages.isEmpty();
}
/**
@@ -321,34 +349,6 @@ public final class FeedbackMessages impl
@Override
public String toString()
{
- return "[feedbackMessages = " + StringList.valueOf(messages) +
"]";
- }
-
- /**
- * Adds a new ui message with level WARNING to the current messages.
- *
- * @param reporter
- * the reporting component
- * @param message
- * the actual message
- */
- public final void warn(Component reporter, Serializable message)
- {
- add(new FeedbackMessage(reporter, message,
FeedbackMessage.WARNING));
- }
-
- /**
- * Adds a message.
- *
- * @param message
- * the message
- */
- public final void add(FeedbackMessage message)
- {
- if (log.isDebugEnabled())
- {
- log.debug("Adding feedback message " + message);
- }
- messages.add(message);
+ return "[feedbackMessages = " + StringList.valueOf(messages) +
']';
}
}
\ No newline at end of file
