Merged changes from 6.6

svn changeset:21335/svn branch:6.7

1 files changed, 16 insertions, 2 deletions

diff --git a/src/com/vaadin/ui/Panel.java b/src/com/vaadin/ui/Panel.java
index 73140fd79a..877171232e 100644
--- a/src/com/vaadin/ui/Panel.java
+++ b/src/com/vaadin/ui/Panel.java
@@ -105,7 +105,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Creates a new empty panel with caption. Default layout is used.
      * 
      * @param caption
-     *            the caption used in the panel.
+     *            the caption used in the panel (HTML/XHTML).
      */
     public Panel(String caption) {
         this(caption, null);
@@ -115,7 +115,7 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
      * Creates a new empty panel with the given caption and content.
      * 
      * @param caption
-     *            the caption of the panel.
+     *            the caption of the panel (HTML/XHTML).
      * @param content
      *            the content used in the panel.
      */
@@ -125,6 +125,20 @@ public class Panel extends AbstractComponentContainer implements Scrollable,
     }
 
     /**
+     * Sets the caption of the panel.
+     * 
+     * Note that the caption is interpreted as HTML/XHTML and therefore care
+     * should be taken not to enable HTML injection and XSS attacks using panel
+     * captions. This behavior may change in future versions.
+     * 
+     * @see AbstractComponent#setCaption(String)
+     */
+    @Override
+    public void setCaption(String caption) {
+        super.setCaption(caption);
+    }
+
+    /**
      * Gets the current layout of the panel.
      * 
      * @return the Current layout of the panel.