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/pages/ReviewProposalPage.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/pages/ReviewProposalPage.java b/src/com/gitblit/wicket/pages/ReviewProposalPage.java index 2b095f9..e181386 100644 --- a/src/com/gitblit/wicket/pages/ReviewProposalPage.java +++ b/src/com/gitblit/wicket/pages/ReviewProposalPage.java @@ -46,7 +46,7 @@ FederationProposal proposal = GitBlit.self().getPendingFederationProposal(token); if (proposal == null) { - error("Could not find federation proposal!", true); + error(getString("gb.couldNotFindFederationProposal"), true); } setupPage(getString("gb.proposals"), proposal.url); @@ -54,7 +54,7 @@ add(new Label("url", proposal.url)); add(new Label("message", proposal.message)); - add(WicketUtils.createTimestampLabel("received", proposal.received, getTimeZone())); + add(WicketUtils.createTimestampLabel("received", proposal.received, getTimeZone(), getTimeUtils())); add(new Label("token", proposal.token)); add(new Label("tokenType", proposal.tokenType.name())); @@ -92,7 +92,7 @@ List<RepositoryModel> repositories = new ArrayList<RepositoryModel>( proposal.repositories.values()); RepositoriesPanel repositoriesPanel = new RepositoriesPanel("repositoriesPanel", false, - repositories, false, getAccessRestrictions()); + false, repositories, false, getAccessRestrictions()); add(repositoriesPanel); } -- Gitblit v1.9.1