Rename @RootTheme -> @Theme

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 326b394a23119625463eb51d15aaeffec9fafeb6..3e206761661e5b45fb08ba09f5954d5a7c6484d1 100644 (file)
--- 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 (file)
index b6f2483..0000000
--- 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 (file)
index 0000000..7c62b07
--- /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();
+}

diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java b/tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java
index c954efd04c4aecdd71105a9054bf9124b57e0bb2..77c0bdb15023e548871648313128506b3fc0d979 100644 (file)
--- 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