From 962827130933297711bc6b4384edcc769e3eed05 Mon Sep 17 00:00:00 2001 From: James Moger Date: Thu, 30 May 2013 23:16:59 -0400 Subject: [PATCH] Centralized isServingRepositories method --- src/main/java/com/gitblit/GitBlit.java | 20 +++++++++++++++++++ .../wicket/panels/RepositoryUrlPanel.java | 6 +----- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java index c5616d93..71f33b4a 100644 --- a/src/main/java/com/gitblit/GitBlit.java +++ b/src/main/java/com/gitblit/GitBlit.java @@ -238,6 +238,26 @@ public class GitBlit implements ServletContextListener { return self().settings instanceof FileSettings; } + /** + * Determine if this Gitblit instance is actively serving git repositories + * or if it is merely a repository viewer. + * + * @return true if Gitblit is serving repositories + */ + public static boolean isServingRepositories() { + return getBoolean(Keys.git.enableGitServlet, true) || (getInteger(Keys.git.daemonPort, 0) > 0); + } + + /** + * Determine if this Gitblit instance is actively serving git repositories + * or if it is merely a repository viewer. + * + * @return true if Gitblit is serving repositories + */ + public static boolean isSendingMail() { + return self().mailExecutor.isReady(); + } + /** * Returns the preferred timezone for the Gitblit instance. * diff --git a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java index 8a64b18e..3711ca9a 100644 --- a/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java +++ b/src/main/java/com/gitblit/wicket/panels/RepositoryUrlPanel.java @@ -162,7 +162,7 @@ public class RepositoryUrlPanel extends BasePanel { } // access restriction icon and tooltip - if (isGitblitServingRepositories()) { + if (GitBlit.isServingRepositories()) { switch (repository.accessRestriction) { case NONE: urlPanel.add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false)); @@ -333,10 +333,6 @@ public class RepositoryUrlPanel extends BasePanel { return pattern.replace("${repoUrl}", repoUrl).replace("${baseUrl}", baseUrl); } - protected boolean isGitblitServingRepositories() { - return GitBlit.getBoolean(Keys.git.enableGitServlet, true) || (GitBlit.getInteger(Keys.git.daemonPort, 0) > 0); - } - protected Label createPermissionBadge(String wicketId, RepositoryUrl repoUrl) { Label permissionLabel = new Label(wicketId, repoUrl.isExternal() ? externalPermission : repoUrl.permission.toString()); WicketUtils.setPermissionClass(permissionLabel, repoUrl.permission); -- 2.39.5