Changeset d749cbd5 in vaadin

Timestamp:

12/22/11 07:40:34 (18 months ago)

Author:

Leif Åstrand <leif@…>

Branches:

master, 7.0, 7.1

Children:

12dab0ad

Parents:

0be23936e

git-author:

Leif Åstrand <leif@…> (12/22/11 07:40:34)

git-committer:

Leif Åstrand <leif@…> (12/22/11 07:40:34)

Message:

Rename @RootTheme -> @Theme

Files:

• src/com/vaadin/Application.java (modified) (2 diffs)
• src/com/vaadin/annotations/Theme.java (moved) (moved from src/com/vaadin/annotations/RootTheme.java) (1 diff)
• tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java (modified) (1 diff)

src/com/vaadin/Application.java

@@ -31 +31 @@
 
 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;
@@ -1975 +1975 @@
      */
     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();

src/com/vaadin/annotations/Theme.java

@@ -17 +17 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface RootTheme {
+public @interface Theme {
     /**
      * @return simple name of the theme

tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java

@@ -1 +1 @@
 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 {