svn commit: r530521 - /incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java

[ivaynberg]

Author: ivaynberg
Date: Thu Apr 19 12:03:52 2007
New Revision: 530521

URL: http://svn.apache.org/viewvc?view=rev&rev=530521
Log:
cleaned up internals

Modified:
    
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java

Modified: 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
URL: 
http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java?view=diff&rev=530521&r1=530520&r2=530521
==============================================================================
--- 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
 (original)
+++ 
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/markup/html/panel/FeedbackPanel.java
 Thu Apr 19 12:03:52 2007
@@ -36,8 +36,8 @@
 
 
 /**
- * A panel that displays [EMAIL PROTECTED] 
org.apache.wicket.feedback.FeedbackMessage}s in a list
- * view. The maximum number of messages to show can be set with
+ * A panel that displays [EMAIL PROTECTED] 
org.apache.wicket.feedback.FeedbackMessage}s in
+ * a list view. The maximum number of messages to show can be set with
  * setMaxMessages().
  * 
  * @see org.apache.wicket.feedback.FeedbackMessage
@@ -97,9 +97,6 @@
 
        private static final long serialVersionUID = 1L;
 
-       /** whether model messages should be HTML escaped. Default is true. */
-       private boolean escapeMessages = true;
-
        /** Message view */
        private final MessageListView messageListView;
 
@@ -194,7 +191,7 @@
         */
        public final boolean getEscapeMessages()
        {
-               return escapeMessages;
+               return getEscapeModelStrings();
        }
 
        /**
@@ -240,7 +237,7 @@
         */
        public final void setEscapeMessages(boolean escapeMessages)
        {
-               this.escapeMessages = escapeMessages;
+               setEscapeModelStrings(escapeMessages);
        }
 
        /**
@@ -338,8 +335,7 @@
        protected Component newMessageDisplayComponent(String id, 
FeedbackMessage message)
        {
                Label label = new Label(id, message.getMessage().toString());
-               label.setEscapeModelStrings(getEscapeMessages()
-                               || FeedbackPanel.this.getEscapeModelStrings());
+               
label.setEscapeModelStrings(FeedbackPanel.this.getEscapeModelStrings());
                return label;
        }
 }