summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2013-02-07 09:19:57 +0000
committerVaadin Code Review <review@vaadin.com>2013-02-07 09:19:57 +0000
commit6e6855ec13af4f6a59a0f47410caa32f0b528777 (patch)
treebf71e7b4ee67f3612a921a31db5a5f03d2982b76 /server/src/com/vaadin
parent888dedd40246839072c4145be26a5ab99a864e47 (diff)
parent179e672b5d3ce8c4c972dcfacbdbd39c5a08d6fa (diff)
downloadvaadin-framework-6e6855ec13af4f6a59a0f47410caa32f0b528777.tar.gz
vaadin-framework-6e6855ec13af4f6a59a0f47410caa32f0b528777.zip
Merge "Made getServlet and getPortlet public (#10882)"
Diffstat (limited to 'server/src/com/vaadin')
-rw-r--r--server/src/com/vaadin/server/VaadinPortletService.java7
-rw-r--r--server/src/com/vaadin/server/VaadinServletService.java7
2 files changed, 12 insertions, 2 deletions
diff --git a/server/src/com/vaadin/server/VaadinPortletService.java b/server/src/com/vaadin/server/VaadinPortletService.java
index e59ea7fd5e..8c1e7af0fa 100644
--- a/server/src/com/vaadin/server/VaadinPortletService.java
+++ b/server/src/com/vaadin/server/VaadinPortletService.java
@@ -46,7 +46,12 @@ public class VaadinPortletService extends VaadinService {
}
}
- protected VaadinPortlet getPortlet() {
+ /**
+ * Retrieves a reference to the portlet associated with this service.
+ *
+ * @return A reference to the VaadinPortlet this service is using
+ */
+ public VaadinPortlet getPortlet() {
return portlet;
}
diff --git a/server/src/com/vaadin/server/VaadinServletService.java b/server/src/com/vaadin/server/VaadinServletService.java
index 71f47ea217..7120e3a5c5 100644
--- a/server/src/com/vaadin/server/VaadinServletService.java
+++ b/server/src/com/vaadin/server/VaadinServletService.java
@@ -44,7 +44,12 @@ public class VaadinServletService extends VaadinService {
}
}
- protected VaadinServlet getServlet() {
+ /**
+ * Retrieves a reference to the servlet associated with this service.
+ *
+ * @return A reference to the VaadinServlet this service is using
+ */
+ public VaadinServlet getServlet() {
return servlet;
}