diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-12-22 09:40:34 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-12-22 09:40:34 +0200 |
| commit | d749cbd51b0d4bfe4cc38878270460018872f159 (patch) | |
| tree | 9f1b973547300141e4b3cb3ed3e5426d99fba2d1 /src | |
| parent | 0be23936ef259c5b44ec51645879cd0830a8d711 (diff) | |
| download | vaadin-framework-d749cbd51b0d4bfe4cc38878270460018872f159.tar.gz vaadin-framework-d749cbd51b0d4bfe4cc38878270460018872f159.zip | |
Rename @RootTheme -> @Theme
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/Application.java | 4 | ||||
| -rw-r--r-- | src/com/vaadin/annotations/Theme.java (renamed from src/com/vaadin/annotations/RootTheme.java) | 2 |
2 files changed, 3 insertions, 3 deletions
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/Theme.java index b6f2483cb6..7c62b07741 100644 --- a/src/com/vaadin/annotations/RootTheme.java +++ b/src/com/vaadin/annotations/Theme.java @@ -16,7 +16,7 @@ import com.vaadin.ui.Root; */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface RootTheme { +public @interface Theme { /** * @return simple name of the theme */ |