minor - make code more readable

Raven.Studio/Infrastructure/UrlParser.cs

@@ -1,100 +1,100 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using Raven.Studio.Models;
-
-namespace Raven.Studio.Infrastructure
-{
-	public class UrlParser
-	{
-		private readonly string url;
-		private string Url
-		{
-			get { return url; }
-		}
-
-		private Dictionary<string, string> queryParams;
-
-		public UrlParser(string url)
-		{
-			this.url = url;
-		}
-
-		public Dictionary<string, string> QueryParams
-		{
-			get
-			{
-				if (queryParams == null)
-				{
-					queryParams = new Dictionary<string, string>();
-					var indexOf = Url.IndexOf('?');
-					if (indexOf == -1)
-						return queryParams;
-
-					var options = Url.Substring(indexOf + 1).Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries);
-					foreach (var option in options)
-					{
-						var param = option.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
-						queryParams.Add(param[0], param[1]);
-					}
-				}
-				return queryParams;
-			}
-		}
-
-		private string path;
-		public string Path
-		{
-			get
-			{
-				if (path == null)
-				{
-					var indexOf = Url.IndexOf('?');
-					path = indexOf != -1 ? Url.Substring(0, indexOf) : Url;
-				}
-				return path;
-			}
-		}
-
-		public string GetQueryParam(string name)
-		{
-			if (QueryParams.ContainsKey(name))
-				return QueryParams[name];
-			return null;
-		}
-
-		public void SetQueryParam(string name, object value)
-		{
-			if (value == null) return;
-			QueryParams[name] = value.ToString();
-		}
-
-		public bool RemoveQueryParam(string name)
-		{
-			return QueryParams.Remove(name);
-		}
-
-		public string BuildUrl()
-		{
-			EnsureDatabaseParameterIncluded();
-
-			var uri = Path;
-			if (string.IsNullOrWhiteSpace(uri))
-				uri = "/home";
-			var query = string.Join("&", QueryParams.Select(x => string.Format("{0}={1}", x.Key, x.Value)));
-			if (string.IsNullOrEmpty(query) == false)
-			{
-				uri += "?" + query;
-			}
-			return uri;
-		}
-
-		private void EnsureDatabaseParameterIncluded()
-		{
-			if (GetQueryParam("database") != null)
-				return;
-
-			SetQueryParam("database", ApplicationModel.Current.Server.Value.SelectedDatabase.Value.Name);
-		}
-	}
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Raven.Studio.Models;
+
+namespace Raven.Studio.Infrastructure
+{
+	public class UrlParser
+	{
+		private readonly string url;
+		private string Url
+		{
+			get { return url; }
+		}
+
+		private Dictionary<string, string> queryParams;
+
+		public UrlParser(string url)
+		{
+			this.url = url;
+		}
+
+		public Dictionary<string, string> QueryParams
+		{
+			get
+			{
+				if (queryParams == null)
+				{
+					queryParams = new Dictionary<string, string>();
+					var indexOf = Url.IndexOf('?');
+					if (indexOf == -1)
+						return queryParams;
+
+					var options = Url.Substring(indexOf + 1).Split(new[] { '&' }, StringSplitOptions.RemoveEmptyEntries);
+					foreach (var option in options)
+					{
+						var param = option.Split(new[] { '=' }, StringSplitOptions.RemoveEmptyEntries);
+						queryParams.Add(param[0], param[1]);
+					}
+				}
+				return queryParams;
+			}
+		}
+
+		private string path;
+		public string Path
+		{
+			get
+			{
+				if (path == null)
+				{
+					var indexOf = Url.IndexOf('?');
+					path = indexOf != -1 ? Url.Substring(0, indexOf) : Url;
+				}
+				return path;
+			}
+		}
+
+		public string GetQueryParam(string name)
+		{
+			if (QueryParams.ContainsKey(name))
+				return QueryParams[name];
+			return null;
+		}
+
+		public void SetQueryParam(string name, object value)
+		{
+			if (value == null) return;
+			QueryParams[name] = value.ToString();
+		}
+
+		public bool RemoveQueryParam(string name)
+		{
+			return QueryParams.Remove(name);
+		}
+
+		public string BuildUrl()
+		{
+			EnsureDatabaseParameterIncluded();
+
+			var uri = Path;
+			if (string.IsNullOrWhiteSpace(uri))
+				uri = "/home";
+			var query = string.Join("&", QueryParams.Select(x => string.Format("{0}={1}", x.Key, x.Value)));
+			if (string.IsNullOrEmpty(query) == false)
+			{
+				uri += "?" + query;
+			}
+			return uri;
+		}
+
+		private void EnsureDatabaseParameterIncluded()
+		{
+			if (GetQueryParam("database") != null)
+				return;
+
+			SetQueryParam("database", ApplicationModel.Database.Value.Name);
+		}
+	}
 }

Raven.Studio/Infrastructure/ViewModel.cs

@@ -41,7 +41,7 @@ protected virtual Task LoadedTimerTickedAsync()
 			return null;
 		}
 
-		public Observable<DatabaseModel> Database {get { return ApplicationModel.Current.Server.Value.SelectedDatabase; }}
+		public Observable<DatabaseModel> Database {get { return ApplicationModel.Database; }}
 
 		public IAsyncDatabaseCommands DatabaseCommands
 		{

Raven.Studio/Models/AllDocumentsModel.cs

@@ -10,7 +10,7 @@ static AllDocumentsModel()
 			Documents = new Observable<DocumentsModel>();
 			Documents.Value = new DocumentsModel();
 			SetTotalResults();
-			ApplicationModel.Current.Server.Value.SelectedDatabase.PropertyChanged += (sender, args) => SetTotalResults();
+			ApplicationModel.Database.PropertyChanged += (sender, args) => SetTotalResults();
 		}
 
 		private static void SetTotalResults()

Raven.Studio/Models/DatabasesListModel.cs

@@ -23,7 +23,7 @@ public BindableCollection<DatabaseModel> Databases
 		private DatabaseModel selectedDatabase;
 		public DatabaseModel SelectedDatabase
 		{
-			get { return selectedDatabase ?? (selectedDatabase = ApplicationModel.Current.Server.Value.SelectedDatabase.Value); }
+			get { return selectedDatabase ?? (selectedDatabase = ApplicationModel.Database.Value); }
 			set
 			{
 				selectedDatabase = value;