projects
/
Sone.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
58ce723
)
Change SoneTemplatePage request handling
author
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Thu, 20 Oct 2016 17:18:42 +0000
(19:18 +0200)
committer
David ‘Bombe’ Roden
<bombe@pterodactylus.net>
Thu, 20 Oct 2016 17:18:42 +0000
(19:18 +0200)
42 files changed:
src/main/java/net/pterodactylus/sone/web/AboutPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/DistrustPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/EditImagePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/IndexPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/LikePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/LockSonePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/LoginPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/LogoutPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/NewPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/OptionsPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/RescuePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/SearchPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/TrustPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/UnlikePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/UntrustPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ViewPostPage.java
patch
|
blob
|
history
src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
patch
|
blob
|
history
diff --git
a/src/main/java/net/pterodactylus/sone/web/AboutPage.java
b/src/main/java/net/pterodactylus/sone/web/AboutPage.java
index
d201e0b
..
87d9816
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/AboutPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/AboutPage.java
@@
-41,8
+41,7
@@
public class AboutPage extends SoneTemplatePage {
}
@Override
}
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
templateContext.set("version", version);
templateContext.set("year", year);
templateContext.set("homepage", homepage);
templateContext.set("version", version);
templateContext.set("year", year);
templateContext.set("homepage", homepage);
diff --git
a/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
b/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
index
be5fc67
..
7602230
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/BookmarkPage.java
@@
-50,8
+50,7
@@
public class BookmarkPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
if (request.getMethod() == Method.POST) {
String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
diff --git
a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
index
404abb1
..
d4b8980
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/BookmarksPage.java
@@
-61,8
+61,7
@@
public class BookmarksPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
Set<Post> allPosts = webInterface.getCore().getBookmarkedPosts();
Collection<Post> loadedPosts = Collections2.filter(allPosts, new Predicate<Post>() {
Set<Post> allPosts = webInterface.getCore().getBookmarkedPosts();
Collection<Post> loadedPosts = Collections2.filter(allPosts, new Predicate<Post>() {
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
index
6ba14f0
..
7423b67
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java
@@
-53,8
+53,7
@@
public class CreateAlbumPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String name = request.getHttpRequest().getPartAsStringFailsafe("name", 64).trim();
if (name.length() == 0) {
if (request.getMethod() == Method.POST) {
String name = request.getHttpRequest().getPartAsStringFailsafe("name", 64).trim();
if (name.length() == 0) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
index
f486379
..
ed478de
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreatePostPage.java
@@
-54,8
+54,7
@@
public class CreatePostPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
if (request.getMethod() == Method.POST) {
String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
if (request.getMethod() == Method.POST) {
String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
index
2383218
..
0bd5217
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java
@@
-54,8
+54,7
@@
public class CreateReplyPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String postId = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
String text = request.getHttpRequest().getPartAsStringFailsafe("text", 65536).trim();
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
diff --git
a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
index
7ea74fe
..
a74204c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
@@
-96,8
+96,7
@@
public class CreateSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
templateContext.set("sones", localSones);
List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
templateContext.set("sones", localSones);
diff --git
a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
index
7d2fa59
..
581266d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java
@@
-46,8
+46,7
@@
public class DeleteAlbumPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
Album album = webInterface.getCore().getAlbum(albumId);
if (request.getMethod() == Method.POST) {
String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
Album album = webInterface.getCore().getAlbum(albumId);
diff --git
a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
index
eeb9e3c
..
e1b2f37
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java
@@
-50,8
+50,7
@@
public class DeleteImagePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String imageId = (request.getMethod() == Method.POST) ? request.getHttpRequest().getPartAsStringFailsafe("image", 36) : request.getHttpRequest().getParam("image");
Image image = webInterface.getCore().getImage(imageId, false);
if (image == null) {
String imageId = (request.getMethod() == Method.POST) ? request.getHttpRequest().getPartAsStringFailsafe("image", 36) : request.getHttpRequest().getParam("image");
Image image = webInterface.getCore().getImage(imageId, false);
if (image == null) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
index
517a07e
..
c2bae56
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DeletePostPage.java
@@
-52,8
+52,7
@@
public class DeletePostPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.GET) {
String postId = request.getHttpRequest().getParam("post");
String returnPage = request.getHttpRequest().getParam("returnPage");
if (request.getMethod() == Method.GET) {
String postId = request.getHttpRequest().getParam("post");
String returnPage = request.getHttpRequest().getParam("returnPage");
diff --git
a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
index
f036489
..
a137b82
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java
@@
-52,8
+52,7
@@
public class DeleteProfileFieldPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
diff --git
a/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
b/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
index
0cd6b4f
..
7112b73
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java
@@
-52,8
+52,7
@@
public class DeleteReplyPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String replyId = request.getHttpRequest().getPartAsStringFailsafe("reply", 36);
Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String replyId = request.getHttpRequest().getPartAsStringFailsafe("reply", 36);
Optional<PostReply> reply = webInterface.getCore().getPostReply(replyId);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
diff --git
a/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
b/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
index
ce01771
..
1390918
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java
@@
-52,8
+52,7
@@
public class DeleteSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
if (request.getHttpRequest().isPartSet("deleteSone")) {
Sone currentSone = getCurrentSone(request.getToadletContext());
if (request.getMethod() == Method.POST) {
if (request.getHttpRequest().isPartSet("deleteSone")) {
Sone currentSone = getCurrentSone(request.getToadletContext());
diff --git
a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
index
80da869
..
c14a012
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java
@@
-51,8
+51,7
@@
public class DismissNotificationPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
Optional<Notification> notification = webInterface.getNotification(notificationId);
if (notification.isPresent() && notification.get().isDismissable()) {
String notificationId = request.getHttpRequest().getPartAsStringFailsafe("notification", 36);
Optional<Notification> notification = webInterface.getNotification(notificationId);
if (notification.isPresent() && notification.get().isDismissable()) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java
b/src/main/java/net/pterodactylus/sone/web/DistrustPage.java
index
c09608a
..
50e3efb
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/DistrustPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/DistrustPage.java
@@
-55,8
+55,7
@@
public class DistrustPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
index
6a08c3c
..
5829c8b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java
@@
-48,8
+48,7
@@
public class EditAlbumPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
Album album = webInterface.getCore().getAlbum(albumId);
if (request.getMethod() == Method.POST) {
String albumId = request.getHttpRequest().getPartAsStringFailsafe("album", 36);
Album album = webInterface.getCore().getAlbum(albumId);
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java
index
b169161
..
419bc1d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditImagePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditImagePage.java
@@
-51,8
+51,7
@@
public class EditImagePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
if (request.getMethod() == Method.POST) {
String imageId = request.getHttpRequest().getPartAsStringFailsafe("image", 36);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
index
8cf18f2
..
e5bee78
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java
@@
-52,8
+52,7
@@
public class EditProfileFieldPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
Sone currentSone = getCurrentSone(request.getToadletContext());
Profile profile = currentSone.getProfile();
diff --git
a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
index
bf76c26
..
cffdeb9
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/EditProfilePage.java
@@
-59,8
+59,7
@@
public class EditProfilePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
ToadletContext toadletContenxt = request.getToadletContext();
Sone currentSone = getCurrentSone(toadletContenxt);
Profile profile = currentSone.getProfile();
ToadletContext toadletContenxt = request.getToadletContext();
Sone currentSone = getCurrentSone(toadletContenxt);
Profile profile = currentSone.getProfile();
diff --git
a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
index
eef94df
..
0652a52
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/FollowSonePage.java
@@
-50,8
+50,7
@@
public class FollowSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
Sone currentSone = getCurrentSone(request.getToadletContext());
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
Sone currentSone = getCurrentSone(request.getToadletContext());
diff --git
a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
index
5da6e53
..
acc6354
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java
@@
-65,8
+65,7
@@
public class ImageBrowserPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String albumId = request.getHttpRequest().getParam("album", null);
if (albumId != null) {
Album album = webInterface.getCore().getAlbum(albumId);
String albumId = request.getHttpRequest().getParam("album", null);
if (albumId != null) {
Album album = webInterface.getCore().getAlbum(albumId);
diff --git
a/src/main/java/net/pterodactylus/sone/web/IndexPage.java
b/src/main/java/net/pterodactylus/sone/web/IndexPage.java
index
e5d5b7d
..
030ec3d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/IndexPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/IndexPage.java
@@
-58,8
+58,7
@@
public class IndexPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
final Sone currentSone = getCurrentSone(request.getToadletContext());
Collection<Post> allPosts = new ArrayList<Post>();
allPosts.addAll(currentSone.getPosts());
final Sone currentSone = getCurrentSone(request.getToadletContext());
Collection<Post> allPosts = new ArrayList<Post>();
allPosts.addAll(currentSone.getPosts());
diff --git
a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
index
d5fb9e2
..
da93a02
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java
@@
-65,8
+65,7
@@
public class KnownSonesPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String sortField = request.getHttpRequest().getParam("sort", defaultSortField);
String sortOrder = request.getHttpRequest().getParam("order", defaultSortOrder);
String filter = request.getHttpRequest().getParam("filter");
String sortField = request.getHttpRequest().getParam("sort", defaultSortField);
String sortOrder = request.getHttpRequest().getParam("order", defaultSortOrder);
String filter = request.getHttpRequest().getParam("filter");
diff --git
a/src/main/java/net/pterodactylus/sone/web/LikePage.java
b/src/main/java/net/pterodactylus/sone/web/LikePage.java
index
171a7be
..
fc39eff
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LikePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LikePage.java
@@
-51,8
+51,7
@@
public class LikePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String type = request.getHttpRequest().getPartAsStringFailsafe("type", 16);
String id = request.getHttpRequest().getPartAsStringFailsafe(type, 36);
if (request.getMethod() == Method.POST) {
String type = request.getHttpRequest().getPartAsStringFailsafe("type", 16);
String id = request.getHttpRequest().getPartAsStringFailsafe(type, 36);
diff --git
a/src/main/java/net/pterodactylus/sone/web/LockSonePage.java
b/src/main/java/net/pterodactylus/sone/web/LockSonePage.java
index
7881e9e
..
a0a9574
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LockSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LockSonePage.java
@@
-50,8
+50,7
@@
public class LockSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
Sone sone = webInterface.getCore().getLocalSone(soneId);
if (sone != null) {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
Sone sone = webInterface.getCore().getLocalSone(soneId);
if (sone != null) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/LoginPage.java
b/src/main/java/net/pterodactylus/sone/web/LoginPage.java
index
608f120
..
f9bd371
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LoginPage.java
@@
-63,8
+63,7
@@
public class LoginPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
/* get all own identities. */
List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
/* get all own identities. */
List<Sone> localSones = new ArrayList<Sone>(webInterface.getCore().getLocalSones());
Collections.sort(localSones, Sone.NICE_NAME_COMPARATOR);
diff --git
a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java
index
d47044c
..
f7a254c
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/LogoutPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/LogoutPage.java
@@
-47,9
+47,8
@@
public class LogoutPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void
processTemplate
(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+ protected void
handleRequest
(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
setCurrentSone(request.getToadletContext(), null);
setCurrentSone(request.getToadletContext(), null);
- super.processTemplate(request, templateContext);
throw new RedirectException("index.html");
}
throw new RedirectException("index.html");
}
diff --git
a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
index
39c5a43
..
dc1841b
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java
@@
-57,8
+57,7
@@
public class MarkAsKnownPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String type = request.getHttpRequest().getPartAsStringFailsafe("type", 5);
if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
throw new RedirectException("invalid.html");
String type = request.getHttpRequest().getPartAsStringFailsafe("type", 5);
if (!type.equals("sone") && !type.equals("post") && !type.equals("reply")) {
throw new RedirectException("invalid.html");
diff --git
a/src/main/java/net/pterodactylus/sone/web/NewPage.java
b/src/main/java/net/pterodactylus/sone/web/NewPage.java
index
2b99adb
..
133a9d1
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/NewPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/NewPage.java
@@
-62,9
+62,7
@@
public class NewPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
-
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
/* collect new elements from notifications. */
Set<Post> posts = new HashSet<Post>(webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false)));
for (PostReply reply : webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false))) {
/* collect new elements from notifications. */
Set<Post> posts = new HashSet<Post>(webInterface.getNewPosts(getCurrentSone(request.getToadletContext(), false)));
for (PostReply reply : webInterface.getNewReplies(getCurrentSone(request.getToadletContext(), false))) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java
index
0bc44d5
..
2bd1bfd
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/OptionsPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/OptionsPage.java
@@
-58,8
+58,7
@@
public class OptionsPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
Preferences preferences = webInterface.getCore().getPreferences();
Sone currentSone = webInterface.getCurrentSone(request.getToadletContext(), false);
if (request.getMethod() == Method.POST) {
Preferences preferences = webInterface.getCore().getPreferences();
Sone currentSone = webInterface.getCurrentSone(request.getToadletContext(), false);
if (request.getMethod() == Method.POST) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/RescuePage.java
b/src/main/java/net/pterodactylus/sone/web/RescuePage.java
index
2383e0d
..
78a2b9e
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/RescuePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/RescuePage.java
@@
-54,8
+54,7
@@
public class RescuePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
Sone currentSone = getCurrentSone(request.getToadletContext(), false);
SoneRescuer soneRescuer = webInterface.getCore().getSoneRescuer(currentSone);
if (request.getMethod() == Method.POST) {
Sone currentSone = getCurrentSone(request.getToadletContext(), false);
SoneRescuer soneRescuer = webInterface.getCore().getSoneRescuer(currentSone);
if (request.getMethod() == Method.POST) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/SearchPage.java
b/src/main/java/net/pterodactylus/sone/web/SearchPage.java
index
39912d2
..
8b444a7
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SearchPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SearchPage.java
@@
-101,8
+101,7
@@
public class SearchPage extends SoneTemplatePage {
*/
@Override
@SuppressWarnings("synthetic-access")
*/
@Override
@SuppressWarnings("synthetic-access")
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String query = request.getHttpRequest().getParam("query").trim();
if (query.length() == 0) {
throw new RedirectException("index.html");
String query = request.getHttpRequest().getParam("query").trim();
if (query.length() == 0) {
throw new RedirectException("index.html");
diff --git
a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
index
203a87d
..
bf9614d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java
@@
-236,7
+236,7
@@
public class SoneTemplatePage extends FreenetTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
+ protected
final
void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
super.processTemplate(request, templateContext);
Sone currentSone = getCurrentSone(request.getToadletContext(), false);
templateContext.set("core", webInterface.getCore());
super.processTemplate(request, templateContext);
Sone currentSone = getCurrentSone(request.getToadletContext(), false);
templateContext.set("core", webInterface.getCore());
@@
-252,6
+252,10
@@
public class SoneTemplatePage extends FreenetTemplatePage {
Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
templateContext.set("notifications", notifications);
templateContext.set("notificationHash", notifications.hashCode());
Collections.sort(notifications, Notification.CREATED_TIME_SORTER);
templateContext.set("notifications", notifications);
templateContext.set("notificationHash", notifications.hashCode());
+ handleRequest(request, templateContext);
+ }
+
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
}
/**
}
/**
diff --git
a/src/main/java/net/pterodactylus/sone/web/TrustPage.java
b/src/main/java/net/pterodactylus/sone/web/TrustPage.java
index
637bb26
..
5b0bfbb
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/TrustPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/TrustPage.java
@@
-55,8
+55,7
@@
public class TrustPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
diff --git
a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
index
51da550
..
8edf2da
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java
@@
-52,8
+52,7
@@
public class UnbookmarkPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
if (request.getMethod() == Method.POST) {
String id = request.getHttpRequest().getPartAsStringFailsafe("post", 36);
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
diff --git
a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
index
d8ff899
..
bff4013
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java
@@
-48,8
+48,7
@@
public class UnfollowSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
Sone currentSone = getCurrentSone(request.getToadletContext());
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
Sone currentSone = getCurrentSone(request.getToadletContext());
diff --git
a/src/main/java/net/pterodactylus/sone/web/UnlikePage.java
b/src/main/java/net/pterodactylus/sone/web/UnlikePage.java
index
ade8b89
..
a17502d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UnlikePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UnlikePage.java
@@
-51,8
+51,7
@@
public class UnlikePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String type = request.getHttpRequest().getPartAsStringFailsafe("type", 16);
String id = request.getHttpRequest().getPartAsStringFailsafe(type, 36);
if (request.getMethod() == Method.POST) {
String type = request.getHttpRequest().getPartAsStringFailsafe("type", 16);
String id = request.getHttpRequest().getPartAsStringFailsafe(type, 36);
diff --git
a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
index
f641361
..
7c36a88
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java
@@
-49,8
+49,7
@@
public class UnlockSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
Sone sone = webInterface.getCore().getLocalSone(soneId);
if (sone != null) {
String soneId = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
Sone sone = webInterface.getCore().getLocalSone(soneId);
if (sone != null) {
diff --git
a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java
b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java
index
9d51276
..
cba3635
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UntrustPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UntrustPage.java
@@
-55,8
+55,7
@@
public class UntrustPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
if (request.getMethod() == Method.POST) {
String returnPage = request.getHttpRequest().getPartAsStringFailsafe("returnPage", 256);
String identity = request.getHttpRequest().getPartAsStringFailsafe("sone", 44);
diff --git
a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
index
21c4272
..
467ceda
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/UploadImagePage.java
@@
-79,8
+79,7
@@
public class UploadImagePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
if (request.getMethod() == Method.POST) {
Sone currentSone = getCurrentSone(request.getToadletContext());
String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
if (request.getMethod() == Method.POST) {
Sone currentSone = getCurrentSone(request.getToadletContext());
String parentId = request.getHttpRequest().getPartAsStringFailsafe("parent", 36);
diff --git
a/src/main/java/net/pterodactylus/sone/web/ViewPostPage.java
b/src/main/java/net/pterodactylus/sone/web/ViewPostPage.java
index
dca59e2
..
56bac8d
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ViewPostPage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ViewPostPage.java
@@
-70,8
+70,7
@@
public class ViewPostPage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String postId = request.getHttpRequest().getParam("post");
boolean raw = request.getHttpRequest().getParam("raw").equals("true");
Optional<Post> post = webInterface.getCore().getPost(postId);
String postId = request.getHttpRequest().getParam("post");
boolean raw = request.getHttpRequest().getParam("raw").equals("true");
Optional<Post> post = webInterface.getCore().getPost(postId);
diff --git
a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
index
fe1e7db
..
119456f
100644
(file)
--- a/
src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
+++ b/
src/main/java/net/pterodactylus/sone/web/ViewSonePage.java
@@
-80,8
+80,7
@@
public class ViewSonePage extends SoneTemplatePage {
* {@inheritDoc}
*/
@Override
* {@inheritDoc}
*/
@Override
- protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
- super.processTemplate(request, templateContext);
+ protected void handleRequest(FreenetRequest request, TemplateContext templateContext) throws RedirectException {
String soneId = request.getHttpRequest().getParam("sone");
Optional<Sone> sone = webInterface.getCore().getSone(soneId);
templateContext.set("sone", sone.orNull());
String soneId = request.getHttpRequest().getParam("sone");
Optional<Sone> sone = webInterface.getCore().getSone(soneId);
templateContext.set("sone", sone.orNull());