Fix typo in public API

diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 587d22ddcd9d77b4eba1a1ec91cc362938f3b89d..cc54ca97cf24486fb2b146c91f3b7055229787a8 100644 (file)
--- a/src/com/vaadin/Application.java
+++ b/src/com/vaadin/Application.java
@@ -29,7 +29,7 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import com.vaadin.annotations.RootInitRequiresBrowserDetals;
+import com.vaadin.annotations.RootInitRequiresBrowserDetails;
 import com.vaadin.annotations.RootTheme;
 import com.vaadin.annotations.RootWidgetset;
 import com.vaadin.data.util.converter.Converter;
@@ -2332,7 +2332,7 @@ public class Application implements Terminal.ErrorListener, Serializable {
                 boolean initRequiresBrowserDetails = (rootPreserveStrategy != null && rootPreserveStrategy
                         .reqsterRequiresBrowserDetails())
                         || root.getClass().isAnnotationPresent(
-                                RootInitRequiresBrowserDetals.class);
+                                RootInitRequiresBrowserDetails.class);
                 if (initRequiresBrowserDetails && browserDetails == null) {
                     pendingRoots.put(rootId, new PendingRootRequest(request));
                 } else {

diff --git a/src/com/vaadin/annotations/RootInitRequiresBrowserDetails.java b/src/com/vaadin/annotations/RootInitRequiresBrowserDetails.java
new file mode 100644 (file)
index 0000000..bd04d2e
--- /dev/null
+++ b/src/com/vaadin/annotations/RootInitRequiresBrowserDetails.java
@@ -0,0 +1,32 @@
+/*
+@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.terminal.WrappedRequest;
+import com.vaadin.ui.Root;
+
+/**
+ * Indicates that the init method in a Root class should not be called until
+ * full browser details ({@link WrappedRequest#getBrowserDetails()}) are
+ * available. Ensuring the availability of this information will typically
+ * requires an additional round trip to the client, which will cause the
+ * application startup to progress more slowly.
+ * 
+ * @see Root#init(com.vaadin.terminal.WrappedRequest)
+ * @see WrappedRequest#getBrowserDetails()
+ * 
+ * @since 7.0
+ * 
+ */
+@Target(ElementType.TYPE)
+@Retention(RetentionPolicy.RUNTIME)
+public @interface RootInitRequiresBrowserDetails {
+    // No methods
+}

diff --git a/src/com/vaadin/annotations/RootInitRequiresBrowserDetals.java b/src/com/vaadin/annotations/RootInitRequiresBrowserDetals.java
deleted file mode 100644 (file)
index 41ae1f9..0000000
--- a/src/com/vaadin/annotations/RootInitRequiresBrowserDetals.java
+++ /dev/null
@@ -1,32 +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.terminal.WrappedRequest;
-import com.vaadin.ui.Root;
-
-/**
- * Indicates that the init method in a Root class should not be called until
- * full browser details ({@link WrappedRequest#getBrowserDetails()}) are
- * available. Ensuring the availability of this information will typically
- * requires an additional round trip to the client, which will cause the
- * application startup to progress more slowly.
- * 
- * @see Root#init(com.vaadin.terminal.WrappedRequest)
- * @see WrappedRequest#getBrowserDetails()
- * 
- * @since 7.0
- * 
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface RootInitRequiresBrowserDetals {
-    // No methods
-}

diff --git a/src/com/vaadin/terminal/WrappedRequest.java b/src/com/vaadin/terminal/WrappedRequest.java
index 468ba7fa96dc80e7807eadfd221d1df21754f430..89be8a32e43c96cdd4418bbc2b0a044fae01127a 100644 (file)
--- a/src/com/vaadin/terminal/WrappedRequest.java
+++ b/src/com/vaadin/terminal/WrappedRequest.java
@@ -16,7 +16,7 @@ import javax.servlet.http.HttpServletRequest;
 
 import com.vaadin.Application;
 import com.vaadin.RootRequiresMoreInformation;
-import com.vaadin.annotations.RootInitRequiresBrowserDetals;
+import com.vaadin.annotations.RootInitRequiresBrowserDetails;
 import com.vaadin.terminal.gwt.server.WebBrowser;
 import com.vaadin.ui.Root;
 
@@ -210,7 +210,7 @@ public interface WrappedRequest extends Serializable {
      * cases, for instance when {@link Application#getRoot} is called again
      * after throwing {@link RootRequiresMoreInformation} or in
      * {@link Root#init(WrappedRequest)} if the Root class is annotated with
-     * {@link RootInitRequiresBrowserDetals}
+     * {@link RootInitRequiresBrowserDetails}
      * 
      * @return the browser details, or <code>null</code> if details are not
      *         available

diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 5194427c758408df4014655625e2f04659880719..1a67edebdeb600c19da891bb853b9402924165ee 100644 (file)
--- a/src/com/vaadin/ui/Root.java
+++ b/src/com/vaadin/ui/Root.java
@@ -18,7 +18,7 @@ import java.util.List;
 import java.util.Map;
 
 import com.vaadin.Application;
-import com.vaadin.annotations.RootInitRequiresBrowserDetals;
+import com.vaadin.annotations.RootInitRequiresBrowserDetails;
 import com.vaadin.event.Action;
 import com.vaadin.event.Action.Handler;
 import com.vaadin.event.ActionManager;
@@ -60,7 +60,7 @@ import com.vaadin.ui.Window.CloseListener;
  * {@link #setContent(ComponentContainer)}.
  * </p>
  * <p>
- * If a {@link RootInitRequiresBrowserDetals} annotation is present on a class
+ * If a {@link RootInitRequiresBrowserDetails} annotation is present on a class
  * extending <code>Root</code>, the framework will ensure {@link BrowserDetails}
  * are present in the {@link WrappedRequest} passed to the init method.
  * </p>
@@ -1094,7 +1094,7 @@ public abstract class Root extends AbstractComponentContainer implements
      * request that caused this root to be created. By default, the
      * {@link BrowserDetails} are note guaranteed to be available in the
      * request. Availability of the browser details can be requested by adding
-     * the {@link RootInitRequiresBrowserDetals} annotation to the class.
+     * the {@link RootInitRequiresBrowserDetails} annotation to the class.
      * </p>
      * 
      * @param request

diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
index 2e0a1d6c6b81c39918232640b52863b765b14b11..8ebea13bf879a99348518b9fd690a55047c9ef03 100644 (file)
--- a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
+++ b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.application;
 
-import com.vaadin.annotations.RootInitRequiresBrowserDetals;
+import com.vaadin.annotations.RootInitRequiresBrowserDetails;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestApplication;
 import com.vaadin.ui.Label;
 import com.vaadin.ui.Root;
 
 public class RefreshStatePreserve extends AbstractTestApplication {
-    @RootInitRequiresBrowserDetals
+    @RootInitRequiresBrowserDetails
     public static class RefreshStateRoot extends Root {
         @Override
         public void init(WrappedRequest request) {

diff --git a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
index 77949264b088b6e11c43e56d0c6a9702ba084103..f112f7a6d28a1a5c9c03b62e1cc0ea4be76c5555 100644 (file)
--- a/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
+++ b/tests/testbench/com/vaadin/tests/components/root/LazyInitRoots.java
@@ -1,7 +1,7 @@
 package com.vaadin.tests.components.root;
 
 import com.vaadin.RootRequiresMoreInformation;
-import com.vaadin.annotations.RootInitRequiresBrowserDetals;
+import com.vaadin.annotations.RootInitRequiresBrowserDetails;
 import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.terminal.WrappedRequest.BrowserDetails;
@@ -12,7 +12,7 @@ import com.vaadin.ui.Root;
 
 public class LazyInitRoots extends AbstractTestApplication {
 
-    @RootInitRequiresBrowserDetals
+    @RootInitRequiresBrowserDetails
     private static class LazyInitRoot extends Root {
         @Override
         public void init(WrappedRequest request) {

diff --git a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java b/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java
index 249a90317d31270299361d2007900965b7c57feb..8d878044486c7f872dc7f91970b9e3450b934b5d 100644 (file)
--- a/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java
+++ b/tests/testbench/com/vaadin/tests/components/root/UriFragmentTest.java
@@ -1,13 +1,13 @@
 package com.vaadin.tests.components.root;
 
-import com.vaadin.annotations.RootInitRequiresBrowserDetals;
+import com.vaadin.annotations.RootInitRequiresBrowserDetails;
 import com.vaadin.terminal.WrappedRequest;
 import com.vaadin.tests.components.AbstractTestRoot;
 import com.vaadin.ui.Button;
 import com.vaadin.ui.Button.ClickEvent;
 import com.vaadin.ui.Label;
 
-@RootInitRequiresBrowserDetals
+@RootInitRequiresBrowserDetails
 public class UriFragmentTest extends AbstractTestRoot {
 
     private final Label fragmentLabel = new Label();