From 1f9daef870a8c7a984955166a542628d69012ed5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 27 May 2011 23:37:24 -0400
Subject: [PATCH] Codepro analyze dependencies. Documentation.
---
src/com/gitblit/wicket/pages/LoginPage.java | 59 +++++++++++++++++++++++++++--------------------------------
1 files changed, 27 insertions(+), 32 deletions(-)
diff --git a/src/com/gitblit/wicket/LoginPage.java b/src/com/gitblit/wicket/pages/LoginPage.java
similarity index 68%
rename from src/com/gitblit/wicket/LoginPage.java
rename to src/com/gitblit/wicket/pages/LoginPage.java
index 8710878..56e979c 100644
--- a/src/com/gitblit/wicket/LoginPage.java
+++ b/src/com/gitblit/wicket/pages/LoginPage.java
@@ -13,12 +13,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package com.gitblit.wicket;
+package com.gitblit.wicket.pages;
import org.apache.wicket.PageParameters;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.StatelessForm;
import org.apache.wicket.markup.html.form.TextField;
@@ -29,7 +28,8 @@
import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.wicket.models.UserModel;
+import com.gitblit.models.UserModel;
+import com.gitblit.wicket.GitBlitWebSession;
public class LoginPage extends WebPage {
@@ -39,42 +39,37 @@
public LoginPage(PageParameters params) {
super(params);
+ // If we are already logged in because user directly accessed
+ // the login url, redirect to the home page
+ if (GitBlitWebSession.get().isLoggedIn()) {
+ setRedirect(true);
+ setResponsePage(getApplication().getHomePage());
+ }
+
add(new Label("title", GitBlit.getString(Keys.web.siteName, Constants.NAME)));
add(new Label("name", Constants.NAME));
- Form<Void> loginForm = new LoginForm("loginForm");
+ StatelessForm<Void> loginForm = new StatelessForm<Void>("loginForm") {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public void onSubmit() {
+ String username = LoginPage.this.username.getObject();
+ char[] password = LoginPage.this.password.getObject().toCharArray();
+
+ UserModel user = GitBlit.self().authenticate(username, password);
+ if (user == null) {
+ error("Invalid username or password!");
+ } else {
+ loginUser(user);
+ }
+ }
+ };
loginForm.add(new TextField<String>("username", username));
loginForm.add(new PasswordTextField("password", password));
loginForm.add(new FeedbackPanel("feedback"));
add(loginForm);
- }
-
- class LoginForm extends StatelessForm<Void> {
- private static final long serialVersionUID = 1L;
-
- public LoginForm(String id) {
- super(id);
-
- // If we are already logged in because user directly accessed
- // the login url, redirect to the home page
- if (GitBlitWebSession.get().isLoggedIn()) {
- setRedirect(true);
- setResponsePage(getApplication().getHomePage());
- }
- }
-
- @Override
- public void onSubmit() {
- String username = LoginPage.this.username.getObject();
- char[] password = LoginPage.this.password.getObject().toCharArray();
-
- UserModel user = GitBlit.self().authenticate(username, password);
- if (user == null) {
- error("Invalid username or password!");
- } else {
- loginUser(user);
- }
- }
}
private void loginUser(UserModel user) {
--
Gitblit v1.9.1