From 969656cd8f417378d9840a246dca698ff8d16551 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 11:03:36 -0400
Subject: [PATCH] Merge branch 'ticket/141' into develop

---
 src/main/java/com/gitblit/manager/IRuntimeManager.java |   28 +++++++++++++++++++++++-----
 1 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/gitblit/manager/IRuntimeManager.java b/src/main/java/com/gitblit/manager/IRuntimeManager.java
index 178b93c..8322d34 100644
--- a/src/main/java/com/gitblit/manager/IRuntimeManager.java
+++ b/src/main/java/com/gitblit/manager/IRuntimeManager.java
@@ -17,14 +17,18 @@
 
 import java.io.File;
 import java.util.Date;
+import java.util.Locale;
 import java.util.Map;
 import java.util.TimeZone;
 
 import com.gitblit.IStoredSettings;
 import com.gitblit.models.ServerSettings;
 import com.gitblit.models.ServerStatus;
+import com.google.inject.Injector;
 
-public interface IRuntimeManager {
+public interface IRuntimeManager extends IManager {
+
+	Injector getInjector();
 
 	void setBaseFolder(File folder);
 
@@ -34,21 +38,23 @@
 	 * Returns the preferred timezone for the Gitblit instance.
 	 *
 	 * @return a timezone
+ 	 * @since 1.4.0
 	 */
 	TimeZone getTimezone();
 
 	/**
-	 * Determine if this Gitblit instance is actively serving git repositories
-	 * or if it is merely a repository viewer.
+	 * Returns the fixed locale for clients, or null if clients may choose their locale
 	 *
-	 * @return true if Gitblit is serving repositories
+	 * @return a fixed locale or null if clients are allowed to specify locale preference
+ 	 * @since 1.5.1
 	 */
-	boolean isServingRepositories();
+	Locale getLocale();
 
 	/**
 	 * Determine if this Gitblit instance is running in debug mode
 	 *
 	 * @return true if Gitblit is running in debug mode
+ 	 * @since 1.4.0
 	 */
 	boolean isDebugMode();
 
@@ -56,15 +62,23 @@
 	 * Returns the boot date of the Gitblit server.
 	 *
 	 * @return the boot date of Gitblit
+ 	 * @since 1.4.0
 	 */
 	Date getBootDate();
 
+	/**
+	 * Returns the server status.
+	 *
+	 * @return the server status
+  	 * @since 1.4.0
+	 */
 	ServerStatus getStatus();
 
 	/**
 	 * Returns the descriptions/comments of the Gitblit config settings.
 	 *
 	 * @return SettingsModel
+ 	 * @since 1.4.0
 	 */
 	ServerSettings getSettingsModel();
 
@@ -72,6 +86,7 @@
 	 * Returns the file object for the specified configuration key.
 	 *
 	 * @return the file
+ 	 * @since 1.4.0
 	 */
 	File getFileOrFolder(String key, String defaultFileOrFolder);
 
@@ -83,6 +98,7 @@
 	 * access based on environment or some other indicator.
 	 *
 	 * @return the file
+ 	 * @since 1.4.0
 	 */
 	File getFileOrFolder(String fileOrFolder);
 
@@ -90,6 +106,7 @@
 	 * Returns the runtime settings.
 	 *
 	 * @return settings
+ 	 * @since 1.4.0
 	 */
 	IStoredSettings getSettings();
 
@@ -98,6 +115,7 @@
 	 *
 	 * @param settings
 	 * @return true if the update succeeded
+ 	 * @since 1.4.0
 	 */
 	boolean updateSettings(Map<String, String> updatedSettings);
 }
\ No newline at end of file

--
Gitblit v1.9.1