From 80d96608dd9f2e0c067918065bfcdcfde0cb3414 Mon Sep 17 00:00:00 2001
From: Leif Åstrand <leif@vaadin.com>
Date: Thu, 2 May 2013 14:05:16 +0300
Subject: Rename runSafely() to access() (#11756)

Change-Id: I640244732fb561d9f55da58f8ba94fd02875c191
---
 server/src/com/vaadin/ui/UI.java | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'server/src/com/vaadin/ui/UI.java')

diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java
index 442edfebb1..f260a6af79 100644
--- a/server/src/com/vaadin/ui/UI.java
+++ b/server/src/com/vaadin/ui/UI.java
@@ -1092,20 +1092,29 @@ public abstract class UI extends AbstractSingleComponentContainer implements
     }
 
     /**
-     * Performs a safe update of this UI.
+     * Provides exclusive access to this UI from outside a request handling
+     * thread.
      * <p>
-     * This method runs the runnable code so that it is safe to update UI and
-     * session variables. It also ensures that all thread locals are set
-     * correctly when executing the runnable.
+     * The given runnable is executed while holding the session lock to ensure
+     * exclusive access to this UI and its session. The UI and related thread
+     * locals are set properly before executing the runnable.
+     * </p>
+     * <p>
+     * RPC handlers for components inside this UI do not need this method as the
+     * session is automatically locked by the framework during request handling.
      * </p>
      * 
      * @param runnable
-     *            The runnable which updates the UI
+     *            the runnable which accesses the UI
      * @throws UIDetachedException
      *             if the UI is not attached to a session (and locking can
      *             therefore not be done)
+     * 
+     * @see #getCurrent()
+     * @see VaadinSession#access(Runnable)
+     * @see VaadinSession#lock()
      */
-    public void runSafely(Runnable runnable) throws UIDetachedException {
+    public void access(Runnable runnable) throws UIDetachedException {
         Map<Class<?>, CurrentInstance> old = null;
 
         VaadinSession session = getSession();
@@ -1118,7 +1127,7 @@ public abstract class UI extends AbstractSingleComponentContainer implements
         try {
             if (getSession() == null) {
                 // UI was detached after fetching the session but before we
-                // acquiried the lock.
+                // acquired the lock.
                 throw new UIDetachedException();
             }
             old = CurrentInstance.setThreadLocals(this);
@@ -1132,6 +1141,15 @@ public abstract class UI extends AbstractSingleComponentContainer implements
 
     }
 
+    /**
+     * @deprecated As of 7.1.0.beta1, use {@link #access(Runnable)} instead.
+     *             This method will be removed before the final 7.1.0 release.
+     */
+    @Deprecated
+    public void runSafely(Runnable runnable) throws UIDetachedException {
+        access(runnable);
+    }
+
     /**
      * Retrieves the object used for configuring tooltips.
      * 
-- 
cgit v1.2.3