Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 0 insertions, 23 deletions

diff --git a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java b/src/com/vaadin/terminal/gwt/client/WidgetLoader.java
deleted file mode 100644
index 749a8343c8..0000000000
--- a/src/com/vaadin/terminal/gwt/client/WidgetLoader.java
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-@VaadinApache2LicenseForJavaFiles@
- */
-package com.vaadin.terminal.gwt.client;
-
-import com.google.gwt.core.client.RunAsyncCallback;
-
-/** A helper class used by WidgetMap implementation. Used by the generated code. */
-abstract class WidgetLoader implements RunAsyncCallback {
-
-    @Override
-    public void onFailure(Throwable reason) {
-        ApplicationConfiguration.endDependencyLoading();
-    }
-
-    @Override
-    public void onSuccess() {
-        addInstantiator();
-        ApplicationConfiguration.endDependencyLoading();
-    }
-
-    abstract void addInstantiator();
-}