Browse Source

Use widget set specified by init parameter (#20276)

1. If a UI has @Widgetset, use that
2. If a "widgetset" init parameter has been specified, use that
3. If there is an AppWidgetset, use that
4. Use DefaultWidgetSet

Change-Id: I522210220bb9e3eb339e9d226833d0fa8eb65839
tags/7.7.2
Artur Signell 7 years ago
parent
commit
516c428ca1
1 changed files with 9 additions and 2 deletions
  1. 9
    2
      server/src/main/java/com/vaadin/server/UIProvider.java

+ 9
- 2
server/src/main/java/com/vaadin/server/UIProvider.java View File

@@ -178,15 +178,22 @@ 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();

// Second case: we have a generated class called APP_WIDGETSET_NAME
// Third case: we have a generated class called APP_WIDGETSET_NAME
if (info != null) {
return info;
}

// third case: we have an AppWidgetset.gwt.xml file
// Fourth case: we have an AppWidgetset.gwt.xml file
else {
InputStream resource = event.getUIClass().getResourceAsStream(
"/" + APP_WIDGETSET_NAME + ".gwt.xml");

Loading…
Cancel
Save