From 59802e0deb28daa091b3f54a7d3cf6ce8882de11 Mon Sep 17 00:00:00 2001 From: Henri Sara Date: Fri, 15 Feb 2013 16:12:33 +0200 Subject: [PATCH] Revert "Made getServlet and getPortlet public (#10882)" (accidentally merged from 7.1) This reverts commit 179e672b5d3ce8c4c972dcfacbdbd39c5a08d6fa. Change-Id: Ice2bdd949bd12000882c406af6ea6c0c6bcc145a --- server/src/com/vaadin/server/VaadinPortletService.java | 7 +------ server/src/com/vaadin/server/VaadinServletService.java | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java index 8c1e7af0fa..e59ea7fd5e 100644 --- a/server/src/com/vaadin/server/VaadinPortletService.java +++ b/server/src/com/vaadin/server/VaadinPortletService.java @@ -46,12 +46,7 @@ public class VaadinPortletService extends VaadinService { } } - /** - * Retrieves a reference to the portlet associated with this service. - * - * @return A reference to the VaadinPortlet this service is using - */ - public VaadinPortlet getPortlet() { + protected VaadinPortlet getPortlet() { return portlet; } diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java index 7120e3a5c5..71f47ea217 100644 --- a/server/src/com/vaadin/server/VaadinServletService.java +++ b/server/src/com/vaadin/server/VaadinServletService.java @@ -44,12 +44,7 @@ public class VaadinServletService extends VaadinService { } } - /** - * Retrieves a reference to the servlet associated with this service. - * - * @return A reference to the VaadinServlet this service is using - */ - public VaadinServlet getServlet() { + protected VaadinServlet getServlet() { return servlet; } -- 2.39.5