Rename @RootWidgetset -> @Widgetset

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 3e206761661e5b45fb08ba09f5954d5a7c6484d1..3875dfa860f4d09a5643baba4306c5ce9495053d 100644 (file)
--- 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/RootWidgetset.java
deleted file mode 100644 (file)
index d848240..0000000
--- a/src/com/vaadin/annotations/RootWidgetset.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.ui.Root;
-
-/**
- * Defines a specific theme for a {@link Root}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface RootWidgetset {
-    /**
-     * @return name of the widgetset
-     */
-    public String value();
-
-}

diff --git a/src/com/vaadin/annotations/Widgetset.java b/src/com/vaadin/annotations/Widgetset.java
new file mode 100644 (file)
index 0000000..99113f7
--- /dev/null
+++ b/src/com/vaadin/annotations/Widgetset.java
@@ -0,0 +1,25 @@
+/*
+@VaadinApache2LicenseForJavaFiles@
+ */
+
+package com.vaadin.annotations;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+import com.vaadin.ui.Root;
+
+/**
+ * Defines a specific theme for a {@link Root}.
+ */
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.TYPE)
+public @interface Widgetset {
+    /**
+     * @return name of the widgetset
+     */
+    public String value();
+
+}

diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java b/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java
index aef87645600690bdc62839f7d8ec19634a780258..c9c001deb6da4b766e1459fcb6d328d58984f9ce 100644 (file)
--- a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java
+++ b/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java
@@ -1,10 +1,10 @@
 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 {
 
     @Override