From 87cc1ed60735a419a3ea23f20614fc0a3f9bab60 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 15 Apr 2011 17:18:51 -0400
Subject: [PATCH] Settings overhaul. Fixes to authentication. Bind interface feature.
---
src/com/gitblit/FileSettings.java | 41 +++++++++++++++++++++++++++--------------
1 files changed, 27 insertions(+), 14 deletions(-)
diff --git a/src/com/gitblit/StoredSettings.java b/src/com/gitblit/FileSettings.java
similarity index 72%
rename from src/com/gitblit/StoredSettings.java
rename to src/com/gitblit/FileSettings.java
index 1db87c0..371b734 100644
--- a/src/com/gitblit/StoredSettings.java
+++ b/src/com/gitblit/FileSettings.java
@@ -11,18 +11,19 @@
import org.slf4j.LoggerFactory;
/**
- * Reads settings file.
+ * Reads GitBlit settings file.
*
*/
-public class StoredSettings {
+public class FileSettings implements IStoredSettings {
- private static Properties properties = new Properties();
+ private Properties properties = new Properties();
- private static long lastread = 0;
+ private long lastread = 0;
- private static final Logger logger = LoggerFactory.getLogger(StoredSettings.class);
+ private final Logger logger = LoggerFactory.getLogger(FileSettings.class);
- public static List<String> getAllKeys(String startingWith) {
+ @Override
+ public List<String> getAllKeys(String startingWith) {
startingWith = startingWith.toLowerCase();
List<String> keys = new ArrayList<String>();
Properties props = read();
@@ -35,7 +36,8 @@
return keys;
}
- public static boolean getBoolean(String name, boolean defaultValue) {
+ @Override
+ public boolean getBoolean(String name, boolean defaultValue) {
Properties props = read();
if (props.containsKey(name)) {
try {
@@ -50,7 +52,8 @@
return defaultValue;
}
- public static int getInteger(String name, int defaultValue) {
+ @Override
+ public int getInteger(String name, int defaultValue) {
Properties props = read();
if (props.containsKey(name)) {
try {
@@ -65,7 +68,8 @@
return defaultValue;
}
- public static String getString(String name, String defaultValue) {
+ @Override
+ public String getString(String name, String defaultValue) {
Properties props = read();
if (props.containsKey(name)) {
try {
@@ -80,15 +84,18 @@
return defaultValue;
}
- public static List<String> getStrings(String name) {
+ @Override
+ public List<String> getStrings(String name) {
return getStrings(name, " ");
}
- public static List<String> getStringsFromValue(String value) {
+ @Override
+ public List<String> getStringsFromValue(String value) {
return getStringsFromValue(value, " ");
}
- public static List<String> getStrings(String name, String separator) {
+ @Override
+ public List<String> getStrings(String name, String separator) {
List<String> strings = new ArrayList<String>();
Properties props = read();
if (props.containsKey(name)) {
@@ -98,7 +105,8 @@
return strings;
}
- public static List<String> getStringsFromValue(String value, String separator) {
+ @Override
+ public List<String> getStringsFromValue(String value, String separator) {
List<String> strings = new ArrayList<String>();
try {
String[] chunks = value.split(separator);
@@ -113,7 +121,7 @@
return strings;
}
- private static synchronized Properties read() {
+ private synchronized Properties read() {
File file = new File(Constants.PROPERTIES_FILE);
if (file.exists() && (file.lastModified() > lastread)) {
try {
@@ -127,4 +135,9 @@
}
return properties;
}
+
+ @Override
+ public String toString() {
+ return getClass().getSimpleName() + ": " + new File(Constants.PROPERTIES_FILE).getAbsolutePath();
+ }
}
--
Gitblit v1.9.1