From 9c47959ece677eaaceb6f3d2eb42b0466f60acdc Mon Sep 17 00:00:00 2001
From: Markus Fömpe <markus.foempe@gmail.com>
Date: Fri, 04 Jan 2013 06:03:09 -0500
Subject: [PATCH] Removed DoubleCheckedLocking from checkstyle.xml. Since Checkstyle 5.6 it's no longer supported (see http://checkstyle.sourceforge.net/releasenotes.html)
---
src/com/gitblit/models/ServerSettings.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/src/com/gitblit/models/ServerSettings.java b/src/com/gitblit/models/ServerSettings.java
index 47148d3..27199b4 100644
--- a/src/com/gitblit/models/ServerSettings.java
+++ b/src/com/gitblit/models/ServerSettings.java
@@ -21,8 +21,6 @@
import java.util.Map;
import java.util.TreeMap;
-import com.gitblit.IStoredSettings;
-
/**
* Server settings represents the settings of the Gitblit server including all
* setting metadata such as name, current value, default value, description, and
@@ -37,27 +35,35 @@
private static final long serialVersionUID = 1L;
+ public List<String> pushScripts;
+
+ public boolean supportsCredentialChanges;
+
+ public boolean supportsDisplayNameChanges;
+
+ public boolean supportsEmailAddressChanges;
+
+ public boolean supportsTeamMembershipChanges;
+
public ServerSettings() {
settings = new TreeMap<String, SettingModel>();
}
-
+
public List<String> getKeys() {
return new ArrayList<String>(settings.keySet());
}
public void add(SettingModel setting) {
- settings.put(setting.name, setting);
+ if (setting != null) {
+ settings.put(setting.name, setting);
+ }
}
public SettingModel get(String key) {
return settings.get(key);
}
-
- public void updateCurrentValues(IStoredSettings storedSettings) {
- for (String key : storedSettings.getAllKeys(null)) {
- if (settings.containsKey(key)) {
- settings.get(key).currentValue = storedSettings.getString(key, "");
- }
- }
+
+ public boolean hasKey(String key) {
+ return settings.containsKey(key);
}
}
--
Gitblit v1.9.1