diff options
| author | Leif Åstrand <leif@vaadin.com> | 2011-12-22 09:41:03 +0200 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2011-12-22 09:41:03 +0200 |
| commit | 12dab0adac3c05dc477522b1024108faf490453b (patch) | |
| tree | 5d3c650752df9f8de472e488f60c40022f78b088 /src | |
| parent | d749cbd51b0d4bfe4cc38878270460018872f159 (diff) | |
| download | vaadin-framework-12dab0adac3c05dc477522b1024108faf490453b.tar.gz vaadin-framework-12dab0adac3c05dc477522b1024108faf490453b.zip | |
Rename @RootWidgetset -> @Widgetset
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/Application.java | 6 | ||||
| -rw-r--r-- | src/com/vaadin/annotations/Widgetset.java (renamed from src/com/vaadin/annotations/RootWidgetset.java) | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java index 3e20676166..3875dfa860 100644 --- a/src/com/vaadin/Application.java +++ b/src/com/vaadin/Application.java @@ -31,7 +31,7 @@ import java.util.regex.Pattern; import com.vaadin.annotations.RootInitRequiresBrowserDetails; import com.vaadin.annotations.Theme; -import com.vaadin.annotations.RootWidgetset; +import com.vaadin.annotations.Widgetset; import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.ConverterFactory; import com.vaadin.data.util.converter.DefaultConverterFactory; @@ -1996,8 +1996,8 @@ public class Application implements Terminal.ErrorListener, Serializable { * @since 7.0 */ public String getWidgetsetForRoot(Root root) { - RootWidgetset rootWidgetset = getAnnotationFor(root.getClass(), - RootWidgetset.class); + Widgetset rootWidgetset = getAnnotationFor(root.getClass(), + Widgetset.class); if (rootWidgetset != null) { return rootWidgetset.value(); } else { diff --git a/src/com/vaadin/annotations/RootWidgetset.java b/src/com/vaadin/annotations/Widgetset.java index d8482406c8..99113f73f9 100644 --- a/src/com/vaadin/annotations/RootWidgetset.java +++ b/src/com/vaadin/annotations/Widgetset.java @@ -16,7 +16,7 @@ import com.vaadin.ui.Root; */ @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) -public @interface RootWidgetset { +public @interface Widgetset { /** * @return name of the widgetset */ |