From a502d96a860456ec5e8c96761db70f7cabb74751 Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Sat, 30 Apr 2016 04:19:14 -0400 Subject: [PATCH] Merge pull request #1073 from gitblit/1062-DocEditorUpdates --- src/main/java/com/gitblit/manager/IRuntimeManager.java | 36 +++++++++++++++++++++++++++++++----- 1 files changed, 31 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..2203b7f 100644 --- a/src/main/java/com/gitblit/manager/IRuntimeManager.java +++ b/src/main/java/com/gitblit/manager/IRuntimeManager.java @@ -17,14 +17,19 @@ 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.gitblit.utils.XssFilter; +import com.google.inject.Injector; -public interface IRuntimeManager { +public interface IRuntimeManager extends IManager { + + Injector getInjector(); void setBaseFolder(File folder); @@ -34,21 +39,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 +63,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 +87,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 +99,7 @@ * access based on environment or some other indicator. * * @return the file + * @since 1.4.0 */ File getFileOrFolder(String fileOrFolder); @@ -90,6 +107,7 @@ * Returns the runtime settings. * * @return settings + * @since 1.4.0 */ IStoredSettings getSettings(); @@ -98,6 +116,14 @@ * * @param settings * @return true if the update succeeded + * @since 1.4.0 */ boolean updateSettings(Map<String, String> updatedSettings); + + /** + * Returns the HTML sanitizer used to clean user content. + * + * @return the HTML sanitizer + */ + XssFilter getXssFilter(); } \ No newline at end of file -- Gitblit v1.9.1