From fedfc550e2beb5f996cfd4f78c14618b6a294315 Mon Sep 17 00:00:00 2001 From: Leif Åstrand Date: Thu, 20 Sep 2012 16:45:25 +0300 Subject: Remove some internal "application" references (#9402) --- server/src/com/vaadin/server/ServletPortletHelper.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/server/src/com/vaadin/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java index 536af12239..efa3c62f6e 100644 --- a/server/src/com/vaadin/server/ServletPortletHelper.java +++ b/server/src/com/vaadin/server/ServletPortletHelper.java @@ -117,21 +117,21 @@ class ServletPortletHelper implements Serializable { ApplicationConstants.HEARTBEAT_REQUEST_PATH); } - public static void initDefaultUIProvider(VaadinSession application, + public static void initDefaultUIProvider(VaadinSession session, VaadinService vaadinService) throws ServiceException { String uiProperty = vaadinService.getDeploymentConfiguration() .getInitParameters().getProperty(VaadinSession.UI_PARAMETER); if (uiProperty != null) { verifyUIClass(uiProperty, vaadinService.getClassLoader()); - application.addUIProvider(new DefaultUIProvider()); + session.addUIProvider(new DefaultUIProvider()); } } - public static void checkUiProviders(VaadinSession newApplication) + public static void checkUiProviders(VaadinSession session) throws ServiceException { - if (newApplication.getUIProviders().isEmpty()) { + if (session.getUIProviders().isEmpty()) { throw new ServiceException( - "No UIProvider has been added to the application and there is no \"" + "No UIProvider has been added and there is no \"" + VaadinSession.UI_PARAMETER + "\" init parameter."); } } -- cgit v1.2.3