From 12dab0adac3c05dc477522b1024108faf490453b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Leif=20=C3=85strand?= <leif@vaadin.com>
Date: Thu, 22 Dec 2011 09:41:03 +0200
Subject: [PATCH] Rename @RootWidgetset -> @Widgetset

---
 src/com/vaadin/Application.java                             | 6 +++---
 .../annotations/{RootWidgetset.java => Widgetset.java}      | 2 +-
 .../com/vaadin/tests/components/root/TestRootWidgetset.java | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename src/com/vaadin/annotations/{RootWidgetset.java => Widgetset.java} (93%)

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
similarity index 93%
rename from src/com/vaadin/annotations/RootWidgetset.java
rename to 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
      */
diff --git a/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java b/tests/testbench/com/vaadin/tests/components/root/TestRootWidgetset.java
index aef8764560..c9c001deb6 100644
--- 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
-- 
2.39.5