From: Henri Sara <hesara@vaadin.com>
Date: Wed, 8 Feb 2012 12:21:37 +0000 (+0200)
Subject: Merge branch 'master' into rpc
X-Git-Tag: 7.0.0.alpha2~440^2~24
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=947e59a1f34a2adfe2222a78f53be1e97ebd6898;p=vaadin-framework.git

Merge branch 'master' into rpc

Conflicts:
	src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
---

947e59a1f34a2adfe2222a78f53be1e97ebd6898
diff --cc src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 88d6009a29,201c3a1cd6..1415e8a0ff
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@@ -40,11 -35,6 +38,10 @@@ import com.google.gwt.user.client.ui.Wi
  import com.vaadin.terminal.gwt.client.ApplicationConfiguration.ErrorMessage;
  import com.vaadin.terminal.gwt.client.RenderInformation.FloatSize;
  import com.vaadin.terminal.gwt.client.RenderInformation.Size;
 +import com.vaadin.terminal.gwt.client.communication.JsonDecoder;
 +import com.vaadin.terminal.gwt.client.communication.JsonEncoder;
 +import com.vaadin.terminal.gwt.client.communication.MethodInvocation;
 +import com.vaadin.terminal.gwt.client.communication.SharedState;
- import com.vaadin.terminal.gwt.client.ui.Field;
  import com.vaadin.terminal.gwt.client.ui.VContextMenu;
  import com.vaadin.terminal.gwt.client.ui.VNotification;
  import com.vaadin.terminal.gwt.client.ui.VNotification.HideEvent;
@@@ -77,12 -67,13 +74,12 @@@ public class ApplicationConnection 
  
      public static final String DISABLED_CLASSNAME = "v-disabled";
  
-     private static final String REQUIRED_CLASSNAME_EXT = "-required";
+     public static final String REQUIRED_CLASSNAME_EXT = "-required";
  
-     private static final String ERROR_CLASSNAME_EXT = "-error";
+     public static final String ERROR_CLASSNAME_EXT = "-error";
  
 -    public static final char VAR_RECORD_SEPARATOR = '\u001e';
 -
 -    public static final char VAR_FIELD_SEPARATOR = '\u001f';
 +    public static final String UPDATE_VARIABLE_INTERFACE = "v";
 +    public static final String UPDATE_VARIABLE_METHOD = "v";
  
      public static final char VAR_BURST_SEPARATOR = '\u001d';