aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java/com/vaadin
diff options
context:
space:
mode:
authorLeif Åstrand <legioth@gmail.com>2017-04-12 13:48:10 +0300
committerAleksi Hietanen <aleksi@vaadin.com>2017-04-12 13:48:10 +0300
commit8b94b1aeca0e8d7cdd2d13d2f9ba32264b310ac2 (patch)
treee9890cfe90f8c5b18e78d1e1d587b0c5fee2c921 /server/src/main/java/com/vaadin
parentb9d37abae37ed7362be221f29a4c3e5fa9663e4c (diff)
downloadvaadin-framework-8b94b1aeca0e8d7cdd2d13d2f9ba32264b310ac2.tar.gz
vaadin-framework-8b94b1aeca0e8d7cdd2d13d2f9ba32264b310ac2.zip
Use setCaption Javadocs inherited from Component (#9066)
Component.setCaption has thorough Javadocs that are shadowed by a very brief snippet in AbstractComponent and an erroneous description in Panel. By removing those snippets, component classes will instead inherit a much more useful description of the method.
Diffstat (limited to 'server/src/main/java/com/vaadin')
-rw-r--r--server/src/main/java/com/vaadin/ui/AbstractComponent.java7
-rw-r--r--server/src/main/java/com/vaadin/ui/Panel.java9
2 files changed, 0 insertions, 16 deletions
diff --git a/server/src/main/java/com/vaadin/ui/AbstractComponent.java b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
index 93d9a23851..c31331c3e4 100644
--- a/server/src/main/java/com/vaadin/ui/AbstractComponent.java
+++ b/server/src/main/java/com/vaadin/ui/AbstractComponent.java
@@ -290,13 +290,6 @@ public abstract class AbstractComponent extends AbstractClientConnector
return getState(false).caption;
}
- /**
- * Sets the component's caption <code>String</code>. Caption is the visible
- * name of the component.
- *
- * @param caption
- * the new caption <code>String</code> for the component.
- */
@Override
public void setCaption(String caption) {
getState().caption = caption;
diff --git a/server/src/main/java/com/vaadin/ui/Panel.java b/server/src/main/java/com/vaadin/ui/Panel.java
index 13d2b4027e..06d4daa9c3 100644
--- a/server/src/main/java/com/vaadin/ui/Panel.java
+++ b/server/src/main/java/com/vaadin/ui/Panel.java
@@ -100,15 +100,6 @@ public class Panel extends AbstractSingleComponentContainer
setCaption(caption);
}
- /**
- * Sets the caption of the panel.
- *
- * Note that the caption is interpreted as HTML 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);