From 332391fc041c2bb0fffb087d2b7d522f50a140a4 Mon Sep 17 00:00:00 2001
From: joha-asc <aschan.johan@gmail.com>
Date: Fri, 22 Jul 2011 16:19:06 +0200
Subject: [PATCH] getAbsoluteURL
Change-Id: I6888c5f28206710ac4663a8856ff7c80c0607887
---
.../se/su/dsv/scipro/message/models/PrivateMessageModel.java | 2 +-
.../java/se/su/dsv/scipro/message/models/ReplyMessageModel.java | 2 +-
.../se/su/dsv/scipro/message/pages/PrivateMessagesPage.java | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/se/su/dsv/scipro/message/models/PrivateMessageModel.java b/src/main/java/se/su/dsv/scipro/message/models/PrivateMessageModel.java
index ea6ce889bb..6d5e54c45d 100644
--- a/src/main/java/se/su/dsv/scipro/message/models/PrivateMessageModel.java
+++ b/src/main/java/se/su/dsv/scipro/message/models/PrivateMessageModel.java
@@ -74,7 +74,7 @@ public class PrivateMessageModel implements IClusterable {
rec.setToUser(selectedUser);
rec.setPrivateMessage(pm);
rec = recipientDao.save(rec);
- notificationController.createNotificationForPrivateMessage(selectedUser, subject +"\n\n" + textMessage, PrivateMessagesPage.getAbsoluteForPrivateMessageURL());
+ notificationController.notifyPrivateMessage(selectedUser, subject +"\n\n" + textMessage, PrivateMessagesPage.getAbsoluteURL());
}
}
}
diff --git a/src/main/java/se/su/dsv/scipro/message/models/ReplyMessageModel.java b/src/main/java/se/su/dsv/scipro/message/models/ReplyMessageModel.java
index 42c00856ee..6b8e13e712 100644
--- a/src/main/java/se/su/dsv/scipro/message/models/ReplyMessageModel.java
+++ b/src/main/java/se/su/dsv/scipro/message/models/ReplyMessageModel.java
@@ -89,7 +89,7 @@ public class ReplyMessageModel implements IClusterable {
r.setToUser(originalMessage.getFromUser());
r.setPrivateMessage(pm);
r = recipientDao.save(r);
- notificationController.createNotificationForReplyPrivateMessage(originalMessage.getFromUser(), getReplySubject() +"\n\n" + getReplyText(), PrivateMessagesPage.getAbsoluteForPrivateMessageURL());
+ notificationController.notifyReplyPrivateMessage(originalMessage.getFromUser(), getReplySubject() +"\n\n" + getReplyText(), PrivateMessagesPage.getAbsoluteURL());
}
diff --git a/src/main/java/se/su/dsv/scipro/message/pages/PrivateMessagesPage.java b/src/main/java/se/su/dsv/scipro/message/pages/PrivateMessagesPage.java
index 8d0884e19c..ccefa548ac 100644
--- a/src/main/java/se/su/dsv/scipro/message/pages/PrivateMessagesPage.java
+++ b/src/main/java/se/su/dsv/scipro/message/pages/PrivateMessagesPage.java
@@ -195,7 +195,7 @@ public class PrivateMessagesPage extends MenuPage {
}
- public static String getAbsoluteForPrivateMessageURL() {
+ public static String getAbsoluteURL() {
PageParameters pageParameters = new PageParameters();
return RequestUtils.toAbsolutePath(RequestCycle.get()
.urlFor(PrivateMessagesPage.class, pageParameters).toString());