summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
authorArtur Signell <artur@vaadin.com>2015-09-28 13:05:11 +0300
committerArtur Signell <artur@vaadin.com>2015-09-28 13:41:16 +0300
commit808297cb940524d7629751be7f347b751a0e97b6 (patch)
tree0a81d22f8be8cacb98af6c114cc43417715dba40 /client
parent1011cff7e8139cd1b7138b2e538264c755c7482f (diff)
downloadvaadin-framework-808297cb940524d7629751be7f347b751a0e97b6.tar.gz
vaadin-framework-808297cb940524d7629751be7f347b751a0e97b6.zip
Create ConnectionStateHandler instance to enable overriding (#19017)
Change-Id: Idef9f42d4db109f236bc7b5e756c9e7441a618fc
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/Vaadin.gwt.xml6
-rw-r--r--client/src/com/vaadin/client/ApplicationConnection.java4
2 files changed, 7 insertions, 3 deletions
diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml
index 1bbece6bd6..35b225560e 100644
--- a/client/src/com/vaadin/Vaadin.gwt.xml
+++ b/client/src/com/vaadin/Vaadin.gwt.xml
@@ -80,6 +80,12 @@
<when-property-is value="ie10" name="user.agent" />
</replace-with>
+ <replace-with
+ class="com.vaadin.client.communication.DefaultConnectionStateHandler">
+ <when-type-is
+ class="com.vaadin.client.communication.ConnectionStateHandler" />
+ </replace-with>
+
<!-- Make Sass linking available -->
<define-linker name="sass"
class="com.vaadin.sass.linker.SassLinker" />
diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java
index 1ae52d71fc..3efb13b632 100644
--- a/client/src/com/vaadin/client/ApplicationConnection.java
+++ b/client/src/com/vaadin/client/ApplicationConnection.java
@@ -45,7 +45,6 @@ import com.vaadin.client.ApplicationConfiguration.ErrorMessage;
import com.vaadin.client.ResourceLoader.ResourceLoadEvent;
import com.vaadin.client.ResourceLoader.ResourceLoadListener;
import com.vaadin.client.communication.ConnectionStateHandler;
-import com.vaadin.client.communication.DefaultConnectionStateHandler;
import com.vaadin.client.communication.Heartbeat;
import com.vaadin.client.communication.MessageHandler;
import com.vaadin.client.communication.MessageSender;
@@ -360,8 +359,7 @@ public class ApplicationConnection implements HasHandlers {
tooltip = GWT.create(VTooltip.class);
loadingIndicator = GWT.create(VLoadingIndicator.class);
serverRpcQueue = GWT.create(ServerRpcQueue.class);
- connectionStateHandler = GWT
- .create(DefaultConnectionStateHandler.class);
+ connectionStateHandler = GWT.create(ConnectionStateHandler.class);
messageHandler = GWT.create(MessageHandler.class);
messageSender = GWT.create(MessageSender.class);
}