From 02ea71c71dbf162561f0a5d4151bc436fca38373 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 30 Sep 2014 09:34:10 -0400
Subject: [PATCH] Merged #195 "Rename redirect method"
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 6 +++---
src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java | 2 +-
src/main/java/com/gitblit/wicket/pages/EditTicketPage.java | 4 ++--
src/main/java/com/gitblit/wicket/pages/NewTicketPage.java | 2 +-
src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java | 2 +-
src/main/java/com/gitblit/wicket/pages/RootPage.java | 4 ++--
6 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index 03d1918..b696700 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -113,11 +113,11 @@
return canonicalUrl;
}
- protected void manualRedirect(Class<? extends BasePage> pageClass) {
- redirect(pageClass, null);
+ protected void redirectTo(Class<? extends BasePage> pageClass) {
+ redirectTo(pageClass, null);
}
- protected void redirect(Class<? extends BasePage> pageClass, PageParameters parameters) {
+ protected void redirectTo(Class<? extends BasePage> pageClass, PageParameters parameters) {
String absoluteUrl = getCanonicalUrl(pageClass, parameters);
getRequestCycle().setRequestTarget(new RedirectRequestTarget(absoluteUrl));
}
diff --git a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java
index 801631e..6e96526 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditMilestonePage.java
@@ -143,7 +143,7 @@
}
if (success && app().tickets().updateMilestone(getRepositoryModel(), tm, createdBy)) {
- redirect(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));
+ redirectTo(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));
} else {
// TODO error
}
diff --git a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
index b55ce9c..c3d405b 100644
--- a/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/EditTicketPage.java
@@ -331,13 +331,13 @@
if (ticket != null) {
TicketNotifier notifier = app().tickets().createNotifier();
notifier.sendMailing(ticket);
- redirect(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
+ redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
} else {
// TODO error
}
} else {
// nothing to change?!
- redirect(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
+ redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
}
}
});
diff --git a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
index 24a4312..b452a91 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewMilestonePage.java
@@ -108,7 +108,7 @@
if (milestone != null) {
milestone.due = due;
app().tickets().updateMilestone(getRepositoryModel(), milestone, createdBy);
- redirect(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));
+ redirectTo(TicketsPage.class, WicketUtils.newOpenTicketsParameter(repositoryName));
} else {
// TODO error
}
diff --git a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
index f80a7d7..8f28055 100644
--- a/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/NewTicketPage.java
@@ -223,7 +223,7 @@
TicketNotifier notifier = app().tickets().createNotifier();
notifier.sendMailing(ticket);
- redirect(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
+ redirectTo(TicketsPage.class, WicketUtils.newObjectParameter(getRepositoryModel().name, "" + ticket.number));
} else {
// TODO error
}
diff --git a/src/main/java/com/gitblit/wicket/pages/RootPage.java b/src/main/java/com/gitblit/wicket/pages/RootPage.java
index 15e4304..43de3b9 100644
--- a/src/main/java/com/gitblit/wicket/pages/RootPage.java
+++ b/src/main/java/com/gitblit/wicket/pages/RootPage.java
@@ -280,12 +280,12 @@
PageParameters params = getPageParameters();
if (params == null) {
// redirect to this page
- manualRedirect(getClass());
+ redirectTo(getClass());
} else {
// Strip username and password and redirect to this page
params.remove("username");
params.remove("password");
- redirect(getClass(), params);
+ redirectTo(getClass(), params);
}
}
}
--
Gitblit v1.9.1