From d749cbd51b0d4bfe4cc38878270460018872f159 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 22 Dec 2011 09:40:34 +0200 Subject: Rename @RootTheme -> @Theme --- src/com/vaadin/Application.java | 4 ++-- src/com/vaadin/annotations/RootTheme.java | 24 ------------------------ src/com/vaadin/annotations/Theme.java | 24 ++++++++++++++++++++++++ 3 files changed, 26 insertions(+), 26 deletions(-) delete mode 100644 src/com/vaadin/annotations/RootTheme.java create mode 100644 src/com/vaadin/annotations/Theme.java (limited to 'src') diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index 326b394a23..3e20676166 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -30,7 +30,7 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; import com.vaadin.annotations.RootInitRequiresBrowserDetails; -import com.vaadin.annotations.RootTheme; +import com.vaadin.annotations.Theme; import com.vaadin.annotations.RootWidgetset; import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.ConverterFactory; @@ -1974,7 +1974,7 @@ public class Application implements Terminal.ErrorListener, Serializable { * @since 7.0 */ public String getThemeForRoot(Root root) { - RootTheme rootTheme = getAnnotationFor(root.getClass(), RootTheme.class); + Theme rootTheme = getAnnotationFor(root.getClass(), Theme.class); if (rootTheme != null) { return rootTheme.value(); } else { diff --git a/src/com/vaadin/annotations/RootTheme.java b/src/com/vaadin/annotations/RootTheme.java deleted file mode 100644 index b6f2483cb6..0000000000 --- a/src/com/vaadin/annotations/RootTheme.java +++ /dev/null @@ -1,24 +0,0 @@ -/* -@VaadinApache2LicenseForJavaFiles@ - */ - -package com.vaadin.annotations; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import com.vaadin.ui.Root; - -/** - * Defines a specific theme for a {@link Root}. - */ -@Retention(RetentionPolicy.RUNTIME) -@Target(ElementType.TYPE) -public @interface RootTheme { - /** - * @return simple name of the theme - */ - public String value(); -} diff --git a/src/com/vaadin/annotations/Theme.java b/src/com/vaadin/annotations/Theme.java new file mode 100644 index 0000000000..7c62b07741 --- /dev/null +++ b/src/com/vaadin/annotations/Theme.java @@ -0,0 +1,24 @@ +/* +@VaadinApache2LicenseForJavaFiles@ + */ + +package com.vaadin.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import com.vaadin.ui.Root; + +/** + * Defines a specific theme for a {@link Root}. + */ +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.TYPE) +public @interface Theme { + /** + * @return simple name of the theme + */ + public String value(); +} -- cgit v1.2.3