Changeset 12dab0ad in vaadin


Ignore:
Timestamp:
Dec 22, 2011 7:41:03 AM (3 years ago)
Author:
Leif Åstrand <leif@…>
Branches:
master, 7.0, 7.1, 7.2, 7.3
Children:
23f1fbcf
Parents:
d749cbd5
Message:

Rename @RootWidgetset -> @Widgetset

Files:
2 edited
1 moved

Legend:

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

    rd749cbd5 r12dab0ad  
    3232import com.vaadin.annotations.RootInitRequiresBrowserDetails; 
    3333import com.vaadin.annotations.Theme; 
    34 import com.vaadin.annotations.RootWidgetset; 
     34import com.vaadin.annotations.Widgetset; 
    3535import com.vaadin.data.util.converter.Converter; 
    3636import com.vaadin.data.util.converter.ConverterFactory; 
     
    19971997     */ 
    19981998    public String getWidgetsetForRoot(Root root) { 
    1999         RootWidgetset rootWidgetset = getAnnotationFor(root.getClass(), 
    2000                 RootWidgetset.class); 
     1999        Widgetset rootWidgetset = getAnnotationFor(root.getClass(), 
     2000                Widgetset.class); 
    20012001        if (rootWidgetset != null) { 
    20022002            return rootWidgetset.value(); 
  • src/com/vaadin/annotations/Widgetset.java

    r057fb45a r12dab0ad  
    1717@Retention(RetentionPolicy.RUNTIME) 
    1818@Target(ElementType.TYPE) 
    19 public @interface RootWidgetset { 
     19public @interface Widgetset { 
    2020    /** 
    2121     * @return name of the widgetset 
  • tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java

    rb86e0213 r12dab0ad  
    11package com.vaadin.tests.components.root; 
    22 
    3 import com.vaadin.annotations.RootWidgetset; 
     3import com.vaadin.annotations.Widgetset; 
    44import com.vaadin.terminal.WrappedRequest; 
    55import com.vaadin.tests.components.AbstractTestRoot; 
    66 
    7 @RootWidgetset("invalid") 
     7@Widgetset("invalid") 
    88public class TestRootWidgetset extends AbstractTestRoot { 
    99 
Note: See TracChangeset for help on using the changeset viewer.