From d749cbd51b0d4bfe4cc38878270460018872f159 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Thu, 22 Dec 2011 09:40:34 +0200
Subject: [PATCH] Rename @RootTheme -> @Theme

---
 src/com/vaadin/Application.java                               | 4 ++--
 src/com/vaadin/annotations/{RootTheme.java => Theme.java}     | 2 +-
 .../com/vaadin/tests/components/root/TestRootTheme.java       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/com/vaadin/annotations/{RootTheme.java => Theme.java} (93%)

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
similarity index 93%
rename from src/com/vaadin/annotations/RootTheme.java
rename to 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
      */
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java b/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java
index c954efd04c..77c0bdb150 100644
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java
+++ b/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java
@@ -1,11 +1,11 @@
 package com.vaadin.tests.components.root;
 
-import com.vaadin.annotations.RootTheme;
+import com.vaadin.annotations.Theme;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestRoot;
 import com.vaadin.ui.Label;
 
-@RootTheme("tests-tickets")
+@Theme("tests-tickets")
 public class TestRootTheme extends AbstractTestRoot {
 
     @Override
-- 
2.39.5