summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeif Åstrand <leif@vaadin.com>2012-09-25 14:45:25 +0300
committerLeif Åstrand <leif@vaadin.com>2012-09-25 14:45:25 +0300
commit38237ffab795288dee42cf6674eed4ee35d9eda5 (patch)
tree960f2fd740ed318dc6a2f1d01086ac23f4ad5575
parent079fee4ac6b8f8633b195f0bc52c29722a232ce0 (diff)
downloadvaadin-framework-38237ffab795288dee42cf6674eed4ee35d9eda5.tar.gz
vaadin-framework-38237ffab795288dee42cf6674eed4ee35d9eda5.zip
Some more renames to remove "Vaadin" from the API (#9750)
-rw-r--r--server/src/com/vaadin/server/SessionDestroyEvent.java5
-rw-r--r--server/src/com/vaadin/server/SessionDestroyListener.java2
-rw-r--r--server/src/com/vaadin/server/VaadinService.java7
3 files changed, 6 insertions, 8 deletions
diff --git a/server/src/com/vaadin/server/SessionDestroyEvent.java b/server/src/com/vaadin/server/SessionDestroyEvent.java
index f35dbc8154..a482a6d7b0 100644
--- a/server/src/com/vaadin/server/SessionDestroyEvent.java
+++ b/server/src/com/vaadin/server/SessionDestroyEvent.java
@@ -21,7 +21,7 @@ import java.util.EventObject;
/**
* Event fired when a Vaadin session is no longer in use.
*
- * @see SessionDestroyListener#sessionDestroy(VaadinSessionDestroyEvent)
+ * @see SessionDestroyListener#sessionDestroy(SessionDestroyEvent)
*
* @author Vaadin Ltd
* @since 7.0.0
@@ -38,8 +38,7 @@ public class SessionDestroyEvent extends EventObject {
* @param session
* the Vaadin session that is no longer used
*/
- public SessionDestroyEvent(VaadinService service,
- VaadinSession session) {
+ public SessionDestroyEvent(VaadinService service, VaadinSession session) {
super(service);
this.session = session;
}
diff --git a/server/src/com/vaadin/server/SessionDestroyListener.java b/server/src/com/vaadin/server/SessionDestroyListener.java
index 035b03c627..a174f3718a 100644
--- a/server/src/com/vaadin/server/SessionDestroyListener.java
+++ b/server/src/com/vaadin/server/SessionDestroyListener.java
@@ -19,7 +19,7 @@ package com.vaadin.server;
/**
* A listener that gets notified when a Vaadin session is no longer used.
*
- * @see VaadinService#addVaadinSessionDestroyListener(VaadinSessionDestroyListener)
+ * @see VaadinService#addSessionDestroyListener(SessionDestroyListener)
*
* @author Vaadin Ltd
* @since 7.0.0
diff --git a/server/src/com/vaadin/server/VaadinService.java b/server/src/com/vaadin/server/VaadinService.java
index fc55a473a0..ce7755f8f1 100644
--- a/server/src/com/vaadin/server/VaadinService.java
+++ b/server/src/com/vaadin/server/VaadinService.java
@@ -331,7 +331,7 @@ public abstract class VaadinService implements Serializable {
* @param listener
* the vaadin session destroy listener
*/
- public void addVaadinSessionDestroyListener(SessionDestroyListener listener) {
+ public void addSessionDestroyListener(SessionDestroyListener listener) {
eventRouter.addListener(SessionDestroyEvent.class, listener,
SESSION_DESTROY_METHOD);
}
@@ -347,13 +347,12 @@ public abstract class VaadinService implements Serializable {
/**
* Removes a Vaadin session destroy listener from this service.
*
- * @see #addVaadinSessionDestroyListener(SessionDestroyListener)
+ * @see #addSessionDestroyListener(SessionDestroyListener)
*
* @param listener
* the vaadin session destroy listener
*/
- public void removeVaadinSessionDestroyListener(
- SessionDestroyListener listener) {
+ public void removeSessionDestroyListener(SessionDestroyListener listener) {
eventRouter.removeListener(SessionDestroyEvent.class, listener,
SESSION_DESTROY_METHOD);
}