From 699e71e76b15081baf746c6ce9c9144f7e5f1ff9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Mon, 30 Sep 2013 10:11:28 -0400 Subject: [PATCH] Trim trailing whitespace and organize imports --- src/main/java/com/gitblit/wicket/pages/UserPage.java | 21 +++++++++++---------- 1 files changed, 11 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/UserPage.java b/src/main/java/com/gitblit/wicket/pages/UserPage.java index 4faee20..4b62e79 100644 --- a/src/main/java/com/gitblit/wicket/pages/UserPage.java +++ b/src/main/java/com/gitblit/wicket/pages/UserPage.java @@ -46,7 +46,7 @@ import com.gitblit.wicket.panels.ProjectRepositoryPanel; public class UserPage extends RootPage { - + List<ProjectModel> projectModels = new ArrayList<ProjectModel>(); public UserPage() { @@ -83,23 +83,23 @@ // construct a temporary user model user = new UserModel(userName); } - + String projectName = user.getPersonalPath(); - + ProjectModel project = GitBlit.self().getProjectModel(projectName); if (project == null) { project = new ProjectModel(projectName); } - + add(new Label("userDisplayName", user.getDisplayName())); add(new Label("userUsername", user.username)); LinkPanel email = new LinkPanel("userEmail", null, user.emailAddress, "mailto:#"); email.setRenderBodyOnly(true); add(email.setVisible(GitBlit.getBoolean(Keys.web.showEmailAddresses, true) && !StringUtils.isEmpty(user.emailAddress))); - + PersonIdent person = new PersonIdent(user.getDisplayName(), user.emailAddress == null ? user.getDisplayName() : user.emailAddress); add(new GravatarImage("gravatar", person, 210)); - + UserModel sessionUser = GitBlitWebSession.get().getUser(); if (sessionUser != null && user.canCreate() && sessionUser.equals(user)) { // user can create personal repositories @@ -107,9 +107,9 @@ } else { add(new Label("newRepository").setVisible(false)); } - + List<RepositoryModel> repositories = getRepositories(params); - + Collections.sort(repositories, new Comparator<RepositoryModel>() { @Override public int compare(RepositoryModel o1, RepositoryModel o2) { @@ -122,10 +122,11 @@ DataView<RepositoryModel> dataView = new DataView<RepositoryModel>("repositoryList", dp) { private static final long serialVersionUID = 1L; + @Override public void populateItem(final Item<RepositoryModel> item) { final RepositoryModel entry = item.getModelObject(); - - ProjectRepositoryPanel row = new ProjectRepositoryPanel("repository", + + ProjectRepositoryPanel row = new ProjectRepositoryPanel("repository", getLocalizer(), this, showAdmin, entry, getAccessRestrictions()); item.add(row); } -- Gitblit v1.9.1