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/GitBlitWebSession.java |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/com/gitblit/wicket/GitBlitWebSession.java b/src/com/gitblit/wicket/GitBlitWebSession.java
index c6cc36d..4996546 100644
--- a/src/com/gitblit/wicket/GitBlitWebSession.java
+++ b/src/com/gitblit/wicket/GitBlitWebSession.java
@@ -7,7 +7,7 @@
 import org.apache.wicket.protocol.http.WebSession;
 import org.apache.wicket.protocol.http.request.WebClientInfo;
 
-import com.gitblit.wicket.models.User;
+import com.gitblit.wicket.models.UserModel;
 
 public final class GitBlitWebSession extends WebSession {
 
@@ -15,7 +15,7 @@
 
 	protected TimeZone timezone = null;
 
-	private User user = null;
+	private UserModel user = null;
 	
 	private String errorMessage = null;
 
@@ -39,11 +39,11 @@
 		return user.canAdmin();
 	}
 
-	public User getUser() {
+	public UserModel getUser() {
 		return user;
 	}
 
-	public void setUser(User user) {
+	public void setUser(UserModel user) {
 		this.user = user;
 	}
 

--
Gitblit v1.9.1