Merge remote branch 'origin/6.8'

Conflicts:
	src/com/vaadin/terminal/gwt/server/CommunicationManager.java

2 files changed, 30 insertions, 6 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
index 5d5f7d7b8c..f9b399caac 100644
--- a/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
+++ b/src/com/vaadin/terminal/gwt/client/ui/richtextarea/VRichTextArea.java
@@ -31,6 +31,7 @@ import com.vaadin.terminal.gwt.client.Util;
 import com.vaadin.terminal.gwt.client.ui.Field;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler;
 import com.vaadin.terminal.gwt.client.ui.ShortcutActionHandler.ShortcutActionHandlerOwner;
+import com.vaadin.terminal.gwt.client.ui.TouchScrollDelegate;
 
 /**
  * This class implements a basic client side rich text editor component.
@@ -85,6 +86,7 @@ public class VRichTextArea extends Composite implements Field, ChangeHandler,
         initWidget(fp);
         setStyleName(CLASSNAME);
 
+        TouchScrollDelegate.enableTouchScrolling(html, html.getElement());
     }
 
     private void createRTAComponents() {
diff --git a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
index 2cf3b23446..f083252897 100644
--- a/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
+++ b/src/com/vaadin/terminal/gwt/server/CommunicationManager.java
@@ -94,8 +94,8 @@ public class CommunicationManager extends AbstractCommunicationManager {
         Root root = application.getRootById(Integer.parseInt(rootId));
         Root.setCurrent(root);
 
-        StreamVariable streamVariable = pidToNameToStreamVariable.get(
-                connectorId).get(variableName);
+        StreamVariable streamVariable = getStreamVariable(connectorId,
+                variableName);
         String secKey = streamVariableToSeckey.get(streamVariable);
         if (secKey.equals(parts[3])) {
 
@@ -119,6 +119,28 @@ public class CommunicationManager extends AbstractCommunicationManager {
 
     }
 
+    /**
+     * Gets a stream variable based on paintable id and variable name. Returns
+     * <code>null</code> if no matching variable has been registered.
+     * 
+     * @param paintableId
+     *            id of paintable to get variable for
+     * @param variableName
+     *            name of the stream variable
+     * @return the corresponding stream variable, or <code>null</code> if not
+     *         found
+     */
+    public StreamVariable getStreamVariable(String paintableId,
+            String variableName) {
+        Map<String, StreamVariable> nameToStreamVariable = pidToNameToStreamVariable
+                .get(paintableId);
+        if (nameToStreamVariable == null) {
+            return null;
+        }
+        StreamVariable streamVariable = nameToStreamVariable.get(variableName);
+        return streamVariable;
+    }
+
     @Override
     protected void postPaint(Root root) {
         super.postPaint(root);
@@ -147,8 +169,8 @@ public class CommunicationManager extends AbstractCommunicationManager {
     private Map<StreamVariable, String> streamVariableToSeckey;
 
     @Override
-    String getStreamVariableTargetUrl(ClientConnector owner, String name,
-            StreamVariable value) {
+    public String getStreamVariableTargetUrl(ClientConnector owner,
+            String name, StreamVariable value) {
         /*
          * We will use the same APP/* URI space as ApplicationResources but
          * prefix url with UPLOAD
@@ -191,10 +213,10 @@ public class CommunicationManager extends AbstractCommunicationManager {
     }
 
     @Override
-    protected void cleanStreamVariable(ClientConnector owner, String name) {
+    public void cleanStreamVariable(ClientConnector owner, String name) {
         Map<String, StreamVariable> nameToStreamVar = pidToNameToStreamVariable
                 .get(owner.getConnectorId());
-        nameToStreamVar.remove("name");
+        nameToStreamVar.remove(name);
         if (nameToStreamVar.isEmpty()) {
             pidToNameToStreamVariable.remove(owner.getConnectorId());
         }