From: Leif Åstrand
Date: Tue, 20 Dec 2011 07:29:36 +0000 (+0200)
Subject: Fix typo in public API
X-Git-Tag: 7.0.0.alpha1~88
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=455202773f7a966b9fc4fc03acaec4bc09d108ee;p=vaadin-framework.git
Fix typo in public API
---
diff --git a/src/com/vaadin/Application.java b/src/com/vaadin/Application.java
index 587d22ddcd..cc54ca97cf 100644
--- 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
index 0000000000..bd04d2e430
--- /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
index 41ae1f9d65..0000000000
--- 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 468ba7fa96..89be8a32e4 100644
--- 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 null
if details are not
* available
diff --git a/src/com/vaadin/ui/Root.java b/src/com/vaadin/ui/Root.java
index 5194427c75..1a67edebde 100644
--- 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)}.
*
*
- * If a {@link RootInitRequiresBrowserDetals} annotation is present on a class
+ * If a {@link RootInitRequiresBrowserDetails} annotation is present on a class
* extending Root
, the framework will ensure {@link BrowserDetails}
* are present in the {@link WrappedRequest} passed to the init method.
*
@@ -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.
*
*
* @param request
diff --git a/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java b/tests/testbench/com/vaadin/tests/application/RefreshStatePreserve.java
index 2e0a1d6c6b..8ebea13bf8 100644
--- 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 77949264b0..f112f7a6d2 100644
--- 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 249a90317d..8d87804448 100644
--- 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();