From 9c47959ece677eaaceb6f3d2eb42b0466f60acdc Mon Sep 17 00:00:00 2001 From: Markus Fömpe <markus.foempe@gmail.com> Date: Fri, 04 Jan 2013 06:03:09 -0500 Subject: [PATCH] Removed DoubleCheckedLocking from checkstyle.xml. Since Checkstyle 5.6 it's no longer supported (see http://checkstyle.sourceforge.net/releasenotes.html) --- src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java index 6f693ee..50f0d52 100644 --- a/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java +++ b/src/com/gitblit/wicket/panels/ProjectRepositoryPanel.java @@ -22,7 +22,6 @@ import org.apache.wicket.Component; import org.apache.wicket.Localizer; -import org.apache.wicket.Page; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.link.BookmarkablePageLink; @@ -135,8 +134,11 @@ } UserModel user = GitBlitWebSession.get().getUser(); + if (user == null) { + user = UserModel.ANONYMOUS; + } Fragment repositoryLinks; - boolean showOwner = user != null && user.username.equalsIgnoreCase(entry.owner); + boolean showOwner = entry.isOwner(user.username); // owner of personal repository gets admin powers boolean showAdmin = isAdmin || entry.isUsersPersonalRepository(user.username); @@ -153,7 +155,6 @@ @Override public void onClick() { if (GitBlit.self().deleteRepositoryModel(entry)) { - info(MessageFormat.format(getString("gb.repositoryDeleted"), entry)); // redirect to the owning page if (entry.isPersonalRepository()) { setResponsePage(getPage().getClass(), WicketUtils.newUsernameParameter(entry.projectPath.substring(1))); -- Gitblit v1.9.1