From 511554c6bdd7daa080506fb62400bf6d295ab9e2 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 11 May 2011 22:07:53 -0400
Subject: [PATCH] Renamed User to UserModel.
---
src/com/gitblit/wicket/LoginPage.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/LoginPage.java b/src/com/gitblit/wicket/LoginPage.java
index 9e26a62..db971d2 100644
--- a/src/com/gitblit/wicket/LoginPage.java
+++ b/src/com/gitblit/wicket/LoginPage.java
@@ -18,7 +18,7 @@
import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.wicket.models.User;
+import com.gitblit.wicket.models.UserModel;
public class LoginPage extends WebPage {
@@ -61,7 +61,7 @@
String username = LoginPage.this.username.getObject();
char[] password = LoginPage.this.password.getObject().toCharArray();
- User user = GitBlit.self().authenticate(username, password);
+ UserModel user = GitBlit.self().authenticate(username, password);
if (user == null)
error("Invalid username or password!");
else
@@ -70,7 +70,7 @@
}
private void tryAutomaticLogin() {
- User user = null;
+ UserModel user = null;
// Grab cookie from Browser Session
Cookie[] cookies = ((WebRequest) getRequestCycle().getRequest()).getCookies();
@@ -82,7 +82,7 @@
loginUser(user);
}
- private void loginUser(User user) {
+ private void loginUser(UserModel user) {
if (user != null) {
// Set the user into the session
GitBlitWebSession.get().setUser(user);
--
Gitblit v1.9.1