Changeset 12dab0ad in vaadin

Timestamp:

12/22/11 07:41:03 (17 months ago)

Author:

Leif Åstrand <leif@…>

Branches:

master, 158c162d688fdfa701f9c6c9035e27d9f64a312f, 7.1

Children:

23f1fbcf

Parents:

d749cbd5

git-author:

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

git-committer:

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

Message:

Rename @RootWidgetset -> @Widgetset

Files:

• src/com/vaadin/Application.java (modified) (2 diffs)
• src/com/vaadin/annotations/Widgetset.java (moved) (moved from src/com/vaadin/annotations/RootWidgetset.java) (1 diff)
• tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java (modified) (1 diff)

src/com/vaadin/Application.java

@@ -32 +32 @@
 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;
@@ -1997 +1997 @@
      */
     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();

src/com/vaadin/annotations/Widgetset.java

@@ -17 +17 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Target(ElementType.TYPE)
-public @interface RootWidgetset {
+public @interface Widgetset {
     /**
      * @return name of the widgetset

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

@@ -1 +1 @@
 package com.vaadin.tests.components.root;
 
-import com.vaadin.annotations.RootWidgetset;
+import com.vaadin.annotations.Widgetset;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestRoot;
 
-@RootWidgetset("invalid")
+@Widgetset("invalid")
 public class TestRootWidgetset extends AbstractTestRoot {