Centralized isServingRepositories method

diff --git a/src/main/java/com/gitblit/GitBlit.java b/src/main/java/com/gitblit/GitBlit.java
index c5616d937e6105008eca3dd419755a36a97688a1..71f33b4a8c648ceab1eec4daaf496166cbf2e660 100644 (file)
--- 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 8a64b18e03c0776a3a3570fb470a9e5d65b57822..3711ca9ab8a97dd68861b6469780ca3a8bbd9edb 100644 (file)
--- 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 {
                }\r
 \r
                // access restriction icon and tooltip\r
-               if (isGitblitServingRepositories()) {\r
+               if (GitBlit.isServingRepositories()) {\r
                        switch (repository.accessRestriction) {\r
                        case NONE:\r
                                urlPanel.add(WicketUtils.newClearPixel("accessRestrictionIcon").setVisible(false));\r
@@ -333,10 +333,6 @@ public class RepositoryUrlPanel extends BasePanel {
                return pattern.replace("${repoUrl}", repoUrl).replace("${baseUrl}", baseUrl);\r
        }\r
        \r
-       protected boolean isGitblitServingRepositories() {\r
-               return GitBlit.getBoolean(Keys.git.enableGitServlet, true) || (GitBlit.getInteger(Keys.git.daemonPort, 0) > 0);\r
-       }\r
-       \r
        protected Label createPermissionBadge(String wicketId, RepositoryUrl repoUrl) {\r
                Label permissionLabel = new Label(wicketId, repoUrl.isExternal() ? externalPermission : repoUrl.permission.toString());\r
                WicketUtils.setPermissionClass(permissionLabel, repoUrl.permission);\r