]> source.dussan.org Git - vaadin-framework.git/commit
Use widget set specified by init parameter (#20276)
authorArtur Signell <artur@vaadin.com>
Thu, 15 Sep 2016 07:43:27 +0000 (10:43 +0300)
committerArtur Signell <artur@vaadin.com>
Sun, 25 Sep 2016 12:30:41 +0000 (15:30 +0300)
commit092b4f7f3192555fe3ae22ac03a89ac2ada2a2dd
treeba28dd87b93b802ed0040f35f8fe2c7a636214a2
parent41dc2fe1611adc70d00e6f77debb2a6d4dcdefb0
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

This changes the default value of the @VaadinServletConfiguration widgetset
parameter to "", to avoid always setting the "widgetset" init parameter when
@VaadinServletConfiguration is used.

Change-Id: I87f9aa294d31e62bb94b7e831dd7b25ca1ce483b
server/src/main/java/com/vaadin/annotations/VaadinServletConfiguration.java
server/src/main/java/com/vaadin/server/UIProvider.java
server/src/main/java/com/vaadin/server/VaadinServlet.java