aboutsummaryrefslogtreecommitdiffstats
path: root/server/src/main/java/com/vaadin/annotations/Push.java
diff options
context:
space:
mode:
authorelmot <elmot@vaadin.com>2016-04-13 15:01:50 +0300
committerelmot <elmot@vaadin.com>2016-04-13 15:32:47 +0300
commit980f879176696906c25e985e4f7c8e3bdc04258d (patch)
treed781a70e24eef0994ba5d371280e1cf837f94825 /server/src/main/java/com/vaadin/annotations/Push.java
parentf7f5ba596dbba0c2374a6d8ac10e89362cbbaeb5 (diff)
parent9b46608f6c645c4289b854e2949bae3b1a2f5147 (diff)
downloadvaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.tar.gz
vaadin-framework-980f879176696906c25e985e4f7c8e3bdc04258d.zip
Merge branch 'master' into feature/mavenize
Change-Id: Id7db526d07a14ac259cbb50415bbafd2a7c2ab94
Diffstat (limited to 'server/src/main/java/com/vaadin/annotations/Push.java')
-rw-r--r--server/src/main/java/com/vaadin/annotations/Push.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/server/src/main/java/com/vaadin/annotations/Push.java b/server/src/main/java/com/vaadin/annotations/Push.java
index b6a28c1560..736bc4488b 100644
--- a/server/src/main/java/com/vaadin/annotations/Push.java
+++ b/server/src/main/java/com/vaadin/annotations/Push.java
@@ -17,6 +17,7 @@
package com.vaadin.annotations;
import java.lang.annotation.ElementType;
+import java.lang.annotation.Inherited;
import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target;
@@ -38,6 +39,7 @@ import com.vaadin.ui.UI;
*/
@Retention(RetentionPolicy.RUNTIME)
@Target(ElementType.TYPE)
+@Inherited
public @interface Push {
/**
* Returns the {@link PushMode} to use for the annotated UI. The default