Revert "Use widget set specified by init parameter (#20276)"7.7.2

Breaks all use of AppWidgetset together with
@VaadinServletConfiguration

This reverts commit 516c428ca127e3c31b7b4d74220e4b7eed4571be.

Change-Id: I9e9bd792479ee1f4dde08c5d2a4d87e06b77f519

1 files changed, 2 insertions, 9 deletions

diff --git a/server/src/main/java/com/vaadin/server/UIProvider.java b/server/src/main/java/com/vaadin/server/UIProvider.java
index d16507234d..e0222933d3 100644
--- a/server/src/main/java/com/vaadin/server/UIProvider.java
+++ b/server/src/main/java/com/vaadin/server/UIProvider.java
@@ -178,22 +178,15 @@ public abstract class UIProvider implements Serializable {
             return new WidgetsetInfoImpl(uiWidgetset.value());
         }
 
-        // Second case: We might have an init parameter, use that
-        String initParameterWidgetSet = event.getService()
-                .getDeploymentConfiguration().getWidgetset(null);
-        if (initParameterWidgetSet != null) {
-            return new WidgetsetInfoImpl(initParameterWidgetSet);
-        }
-
         // Find the class AppWidgetset in the default package if one exists
         WidgetsetInfo info = getWidgetsetClassInfo();
 
-        // Third case: we have a generated class called APP_WIDGETSET_NAME
+        // Second case: we have a generated class called APP_WIDGETSET_NAME
         if (info != null) {
             return info;
         }
 
-        // Fourth case: we have an AppWidgetset.gwt.xml file
+        // third case: we have an AppWidgetset.gwt.xml file
         else {
             InputStream resource = event.getUIClass()
                     .getResourceAsStream("/" + APP_WIDGETSET_NAME + ".gwt.xml");