Skip to content

Commit

Permalink
Revert "Use widget set specified by init parameter (#20276)"
Browse files Browse the repository at this point in the history
Breaks all use of AppWidgetset together with
@VaadinServletConfiguration

This reverts commit 516c428.

Change-Id: I9e9bd792479ee1f4dde08c5d2a4d87e06b77f519
  • Loading branch information
Legioth authored and Artur- committed Sep 22, 2016
1 parent 961851b commit 41dc2fe
Showing 1 changed file with 2 additions and 9 deletions.
11 changes: 2 additions & 9 deletions server/src/main/java/com/vaadin/server/UIProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -178,22 +178,15 @@ public WidgetsetInfo getWidgetsetInfo(UICreateEvent event) {
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");
Expand Down

0 comments on commit 41dc2fe

Please sign in to comment.