From b75734f0600c333d70a3659af82be54caf3cfd3e Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 21 Oct 2011 17:34:12 -0400
Subject: Revised settings RPC to be Map<String, SettingModel>.

Added setting metadata. Added server status rpc. Improved setting tab in
Manager.
---
 src/com/gitblit/client/GitblitModel.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'src/com/gitblit/client/GitblitModel.java')

diff --git a/src/com/gitblit/client/GitblitModel.java b/src/com/gitblit/client/GitblitModel.java
index 22d67f62..55e74b9c 100644
--- a/src/com/gitblit/client/GitblitModel.java
+++ b/src/com/gitblit/client/GitblitModel.java
@@ -24,10 +24,11 @@ import java.util.Map;
 
 import com.gitblit.GitBlitException.ForbiddenException;
 import com.gitblit.GitBlitException.UnauthorizedException;
-import com.gitblit.IStoredSettings;
 import com.gitblit.Keys;
 import com.gitblit.models.FederationModel;
 import com.gitblit.models.RepositoryModel;
+import com.gitblit.models.ServerStatus;
+import com.gitblit.models.SettingModel;
 import com.gitblit.models.UserModel;
 import com.gitblit.utils.RpcUtils;
 
@@ -43,7 +44,7 @@ public class GitblitModel implements Serializable {
 
 	private volatile boolean isAdmin;
 
-	private volatile IStoredSettings settings;
+	private volatile Map<String, SettingModel> settings;
 
 	private final List<RepositoryModel> allRepositories;
 
@@ -51,6 +52,8 @@ public class GitblitModel implements Serializable {
 
 	private final List<FederationModel> federationRegistrations;
 
+	private ServerStatus status;
+
 	public GitblitModel(String url, String account, char[] password) {
 		this.url = url;
 		this.account = account;
@@ -66,8 +69,8 @@ public class GitblitModel implements Serializable {
 
 		try {
 			settings = RpcUtils.getSettings(url, account, password);
+			status = RpcUtils.getStatus(url, account, password);
 			refreshUsers();
-			refreshFederationRegistrations();
 			isAdmin = true;
 		} catch (UnauthorizedException e) {
 		} catch (ForbiddenException e) {
@@ -84,10 +87,14 @@ public class GitblitModel implements Serializable {
 		return account != null && account.equalsIgnoreCase(model.owner);
 	}
 
-	public IStoredSettings getSettings() {
+	public Map<String, SettingModel> getSettings() {
 		return settings;
 	}
 
+	public String getSettingDescription(String key) {
+		return settings.get(key).description;
+	}
+
 	public List<RepositoryModel> refreshRepositories() throws IOException {
 		Map<String, RepositoryModel> repositories = RpcUtils
 				.getRepositories(url, account, password);
@@ -135,7 +142,7 @@ public class GitblitModel implements Serializable {
 	}
 
 	public List<String> getFederationSets() {
-		return settings.getStrings(Keys.federation.sets);
+		return settings.get(Keys.federation.sets).getStrings();
 	}
 
 	public List<RepositoryModel> getRepositories() {
-- 
cgit v1.2.3