From d25c599b9967549fe0ebc7a56ca785c317ba3d4b Mon Sep 17 00:00:00 2001 From: James Moger Date: Mon, 9 Jan 2012 21:07:01 -0500 Subject: [PATCH] Documentation. Find bugs. Organized imports. --- docs/05_roadmap.mkd | 3 +++ src/com/gitblit/GitBlit.java | 4 +--- src/com/gitblit/models/FederationModel.java | 2 +- src/com/gitblit/utils/TimeUtils.java | 2 -- src/com/gitblit/wicket/pages/SummaryPage.java | 2 +- src/com/gitblit/wicket/panels/ObjectContainer.java | 2 -- tests/com/gitblit/tests/GitBlitTest.java | 2 +- 7 files changed, 7 insertions(+), 10 deletions(-) diff --git a/docs/05_roadmap.mkd b/docs/05_roadmap.mkd index c1581551..86888314 100644 --- a/docs/05_roadmap.mkd +++ b/docs/05_roadmap.mkd @@ -9,6 +9,7 @@ This list is volatile. * Manager: support federation RPCs * Manager: redesign ref indicators in log, search, and activity views to support multiple local branches, remote branches, and tags * Gitblit: Lucene integration with multi-repository search (issue 16) +* Gitblit: Serve repositories on root URL rather than /git (investigate JGit 1.2 GitFilter) ### TODO (medium priority) @@ -31,6 +32,8 @@ This list is volatile. ### IDEAS +* Gitblit: Re-use the EGit branch visualization table cell renderer as some sort of servlet +* Gitblit: Support personal repositories (~username/repo) * Gitblit: diff should highlight inserted/removed fragment compared to original line * Gitblit: implement branch permission controls as Groovy pre-receive script. *Maintain permissions text file similar to a gitolite configuration file or svn authz file.* diff --git a/src/com/gitblit/GitBlit.java b/src/com/gitblit/GitBlit.java index 2448f7ae..bf3660d0 100644 --- a/src/com/gitblit/GitBlit.java +++ b/src/com/gitblit/GitBlit.java @@ -1759,9 +1759,7 @@ public class GitBlit implements ServletContextListener { try { // check to see if this "file" is a login service class Class realmClass = Class.forName(realm); - if (IUserService.class.isAssignableFrom(realmClass)) { - loginService = (IUserService) realmClass.newInstance(); - } + loginService = (IUserService) realmClass.newInstance(); } catch (Throwable t) { loginService = new GitblitUserService(); } diff --git a/src/com/gitblit/models/FederationModel.java b/src/com/gitblit/models/FederationModel.java index 61c8576b..1d211ce9 100644 --- a/src/com/gitblit/models/FederationModel.java +++ b/src/com/gitblit/models/FederationModel.java @@ -114,7 +114,7 @@ public class FederationModel implements Serializable, Comparable -1) { // convert to minutes mins *= 60; - } else if (frequency.indexOf("min") > -1) { - // default mins } return mins; } diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index d928b06d..904ec44d 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -37,9 +37,9 @@ import org.wicketstuff.googlecharts.LineStyle; import org.wicketstuff.googlecharts.MarkerType; import org.wicketstuff.googlecharts.ShapeMarker; +import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.GitBlit; import com.gitblit.Keys; -import com.gitblit.Constants.AccessRestrictionType; import com.gitblit.models.Metric; import com.gitblit.models.PathModel; import com.gitblit.models.RepositoryModel; diff --git a/src/com/gitblit/wicket/panels/ObjectContainer.java b/src/com/gitblit/wicket/panels/ObjectContainer.java index 79bd3a7c..d7f1f789 100644 --- a/src/com/gitblit/wicket/panels/ObjectContainer.java +++ b/src/com/gitblit/wicket/panels/ObjectContainer.java @@ -32,8 +32,6 @@ import org.apache.wicket.protocol.http.request.WebClientInfo; import org.apache.wicket.request.ClientInfo; import org.apache.wicket.util.value.IValueMap; -import com.gitblit.wicket.WicketUtils; - /** * https://cwiki.apache.org/WICKET/object-container-adding-flash-to-a-wicket-application.html */ diff --git a/tests/com/gitblit/tests/GitBlitTest.java b/tests/com/gitblit/tests/GitBlitTest.java index 28603f87..418f9384 100644 --- a/tests/com/gitblit/tests/GitBlitTest.java +++ b/tests/com/gitblit/tests/GitBlitTest.java @@ -17,8 +17,8 @@ package com.gitblit.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; import java.util.List; -- 2.39.5