Changeset d749cbd5 in vaadin


Ignore:
Timestamp:
12/22/11 07:40:34 (2 years ago)
Author:
Leif Åstrand <leif@…>
Branches:
master, 7.0, 7.1, 7.2
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:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • src/com/vaadin/Application.java

    ra252e7b1 rd749cbd5  
    3131 
    3232import com.vaadin.annotations.RootInitRequiresBrowserDetails; 
    33 import com.vaadin.annotations.RootTheme; 
     33import com.vaadin.annotations.Theme; 
    3434import com.vaadin.annotations.RootWidgetset; 
    3535import com.vaadin.data.util.converter.Converter; 
     
    19751975     */ 
    19761976    public String getThemeForRoot(Root root) { 
    1977         RootTheme rootTheme = getAnnotationFor(root.getClass(), RootTheme.class); 
     1977        Theme rootTheme = getAnnotationFor(root.getClass(), Theme.class); 
    19781978        if (rootTheme != null) { 
    19791979            return rootTheme.value(); 
  • src/com/vaadin/annotations/Theme.java

    r405aee7a rd749cbd5  
    1717@Retention(RetentionPolicy.RUNTIME) 
    1818@Target(ElementType.TYPE) 
    19 public @interface RootTheme { 
     19public @interface Theme { 
    2020    /** 
    2121     * @return simple name of the theme 
  • tests/testbench/com/vaadin/tests/components/root/TestRootTheme.java

    rb86e0213 rd749cbd5  
    11package com.vaadin.tests.components.root; 
    22 
    3 import com.vaadin.annotations.RootTheme; 
     3import com.vaadin.annotations.Theme; 
    44import com.vaadin.terminal.WrappedRequest; 
    55import com.vaadin.tests.components.AbstractTestRoot; 
    66import com.vaadin.ui.Label; 
    77 
    8 @RootTheme("tests-tickets") 
     8@Theme("tests-tickets") 
    99public class TestRootTheme extends AbstractTestRoot { 
    1010 
Note: See TracChangeset for help on using the changeset viewer.