From 2a7306a1d92522569a8bb6e5a7c0bcdd5cf4cfaa Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 26 May 2011 17:11:38 -0400
Subject: [PATCH] Findbugs. CodePro Audit. Checkstyle. Unit test refactoring.
---
src/com/gitblit/wicket/LoginPage.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/com/gitblit/wicket/LoginPage.java b/src/com/gitblit/wicket/LoginPage.java
index af1a23d..8710878 100644
--- a/src/com/gitblit/wicket/LoginPage.java
+++ b/src/com/gitblit/wicket/LoginPage.java
@@ -39,7 +39,7 @@
public LoginPage(PageParameters params) {
super(params);
- add(new Label("title", GitBlit.self().settings().getString(Keys.web.siteName, Constants.NAME)));
+ add(new Label("title", GitBlit.getString(Keys.web.siteName, Constants.NAME)));
add(new Label("name", Constants.NAME));
Form<Void> loginForm = new LoginForm("loginForm");
@@ -69,13 +69,14 @@
char[] password = LoginPage.this.password.getObject().toCharArray();
UserModel user = GitBlit.self().authenticate(username, password);
- if (user == null)
+ if (user == null) {
error("Invalid username or password!");
- else
+ } else {
loginUser(user);
+ }
}
}
-
+
private void loginUser(UserModel user) {
if (user != null) {
// Set the user into the session
--
Gitblit v1.9.1