diff options
author | James Moger <james.moger@gitblit.com> | 2012-01-06 17:24:55 -0500 |
---|---|---|
committer | James Moger <james.moger@gitblit.com> | 2012-01-06 17:24:55 -0500 |
commit | 6c6fbf522e35d32924850ff1110680844c0382f4 (patch) | |
tree | bcaf25a40d0e5f799d1ba476ef9239b1536e1e19 | |
parent | 679f2bd6e09afe117e9b30fedcf0d351fefaecd5 (diff) | |
download | gitblit-6c6fbf522e35d32924850ff1110680844c0382f4.tar.gz gitblit-6c6fbf522e35d32924850ff1110680844c0382f4.zip |
Strip trailing .git from displayed repository links, saves room, looks cleaner
-rw-r--r-- | src/com/gitblit/models/RepositoryModel.java | 7 | ||||
-rw-r--r-- | src/com/gitblit/utils/StringUtils.java | 7 | ||||
-rw-r--r-- | src/com/gitblit/wicket/pages/RepositoryPage.java | 4 | ||||
-rw-r--r-- | src/com/gitblit/wicket/panels/ActivityPanel.java | 3 | ||||
-rw-r--r-- | src/com/gitblit/wicket/panels/RepositoriesPanel.java | 2 |
5 files changed, 18 insertions, 5 deletions
diff --git a/src/com/gitblit/models/RepositoryModel.java b/src/com/gitblit/models/RepositoryModel.java index 7e33ab06..ad0adaa6 100644 --- a/src/com/gitblit/models/RepositoryModel.java +++ b/src/com/gitblit/models/RepositoryModel.java @@ -59,6 +59,8 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel public List<String> postReceiveScripts;
public List<String> mailingLists;
+ private String displayName;
+
public RepositoryModel() {
this("", "", "", new Date(0));
}
@@ -75,7 +77,10 @@ public class RepositoryModel implements Serializable, Comparable<RepositoryModel @Override
public String toString() {
- return name;
+ if (displayName == null) {
+ displayName = StringUtils.stripDotGit(name);
+ }
+ return displayName;
}
@Override
diff --git a/src/com/gitblit/utils/StringUtils.java b/src/com/gitblit/utils/StringUtils.java index 1e478999..fc0bf42f 100644 --- a/src/com/gitblit/utils/StringUtils.java +++ b/src/com/gitblit/utils/StringUtils.java @@ -488,4 +488,11 @@ public class StringUtils { String bs = Integer.toHexString((int) (b * 256));
return "#" + rs + gs + bs;
}
+
+ public static String stripDotGit(String value) {
+ if (value.toLowerCase().endsWith(".git")) {
+ return value.substring(0, value.length() - 4);
+ }
+ return value;
+ }
}
\ No newline at end of file diff --git a/src/com/gitblit/wicket/pages/RepositoryPage.java b/src/com/gitblit/wicket/pages/RepositoryPage.java index 85719f15..c84ccb06 100644 --- a/src/com/gitblit/wicket/pages/RepositoryPage.java +++ b/src/com/gitblit/wicket/pages/RepositoryPage.java @@ -141,8 +141,8 @@ public abstract class RepositoryPage extends BasePage { }
@Override
- protected void setupPage(String repositoryName, String pageName) {
- add(new LinkPanel("repositoryName", null, repositoryName, SummaryPage.class,
+ protected void setupPage(String repositoryName, String pageName) {
+ add(new LinkPanel("repositoryName", null, StringUtils.stripDotGit(repositoryName), SummaryPage.class,
WicketUtils.newRepositoryParameter(repositoryName)));
add(new Label("pageName", pageName));
diff --git a/src/com/gitblit/wicket/panels/ActivityPanel.java b/src/com/gitblit/wicket/panels/ActivityPanel.java index 80621ae4..7cafb828 100644 --- a/src/com/gitblit/wicket/panels/ActivityPanel.java +++ b/src/com/gitblit/wicket/panels/ActivityPanel.java @@ -94,8 +94,9 @@ public class ActivityPanel extends BasePanel { fragment.add(authorLink);
// repository
+ String repoName = StringUtils.stripDotGit(commit.repository);
LinkPanel repositoryLink = new LinkPanel("repository", null,
- commit.repository, SummaryPage.class,
+ repoName, SummaryPage.class,
WicketUtils.newRepositoryParameter(commit.repository), true);
WicketUtils.setCssBackground(repositoryLink, commit.repository);
fragment.add(repositoryLink);
diff --git a/src/com/gitblit/wicket/panels/RepositoriesPanel.java b/src/com/gitblit/wicket/panels/RepositoriesPanel.java index 3a876bdd..3b3db492 100644 --- a/src/com/gitblit/wicket/panels/RepositoriesPanel.java +++ b/src/com/gitblit/wicket/panels/RepositoriesPanel.java @@ -144,7 +144,7 @@ public class RepositoriesPanel extends BasePanel { item.add(row);
// try to strip group name for less cluttered list
- String repoName = entry.name;
+ String repoName = entry.toString();
if (!StringUtils.isEmpty(currGroupName) && (repoName.indexOf('/') > -1)) {
repoName = repoName.substring(currGroupName.length() + 1);
}
|