Minor cosmetic improvements
git-svn-id: file:///srv/devel/repo-conversion/nusu@324 d2e56fa2-650e-0410-a79f-9358c0239efd
This commit is contained in:
parent
52401a43ac
commit
3a945f5d48
|
@ -39,7 +39,7 @@ namespace Nuclex.Support {
|
||||||
/// inside the thread pool because the limited available threads will become
|
/// inside the thread pool because the limited available threads will become
|
||||||
/// congested quickly. It is encouraged to use this class in parallel with
|
/// congested quickly. It is encouraged to use this class in parallel with
|
||||||
/// .NET's own thread pool, putting tasks that can block into the .NET thread
|
/// .NET's own thread pool, putting tasks that can block into the .NET thread
|
||||||
/// pool and task that perform pure processing into the affine thread pool.
|
/// pool and tasks that perform pure processing into the affine thread pool.
|
||||||
/// </para>
|
/// </para>
|
||||||
/// <para>
|
/// <para>
|
||||||
/// Implementation based on original code provided by Stephen Toub
|
/// Implementation based on original code provided by Stephen Toub
|
||||||
|
|
|
@ -51,7 +51,7 @@ namespace Nuclex.Support.Settings {
|
||||||
var store = new ConfigurationFileStore();
|
var store = new ConfigurationFileStore();
|
||||||
var state = new ParserState() {
|
var state = new ParserState() {
|
||||||
Store = store,
|
Store = store,
|
||||||
Category = store.RootCategory
|
Category = store.rootCategory
|
||||||
};
|
};
|
||||||
|
|
||||||
for(; ; ) {
|
for(; ; ) {
|
||||||
|
|
|
@ -73,7 +73,7 @@ namespace Nuclex.Support.Settings {
|
||||||
public ConfigurationFileStore() {
|
public ConfigurationFileStore() {
|
||||||
this.options = new List<Option>();
|
this.options = new List<Option>();
|
||||||
this.categoryLookup = new Dictionary<string, Category>();
|
this.categoryLookup = new Dictionary<string, Category>();
|
||||||
this.RootCategory = new Category() {
|
this.rootCategory = new Category() {
|
||||||
OptionLookup = new Dictionary<string, Option>(),
|
OptionLookup = new Dictionary<string, Option>(),
|
||||||
Lines = new List<string>()
|
Lines = new List<string>()
|
||||||
};
|
};
|
||||||
|
@ -82,8 +82,8 @@ namespace Nuclex.Support.Settings {
|
||||||
/// <summary>Saves the configuration file into the specified writer</summary>
|
/// <summary>Saves the configuration file into the specified writer</summary>
|
||||||
/// <param name="writer">Writer the configuration file will be saved into</param>
|
/// <param name="writer">Writer the configuration file will be saved into</param>
|
||||||
public void Save(TextWriter writer) {
|
public void Save(TextWriter writer) {
|
||||||
for(int index = 0; index < this.RootCategory.Lines.Count; ++index) {
|
for(int index = 0; index < this.rootCategory.Lines.Count; ++index) {
|
||||||
writer.WriteLine(this.RootCategory.Lines[index]);
|
writer.WriteLine(this.rootCategory.Lines[index]);
|
||||||
}
|
}
|
||||||
foreach(Category category in this.categoryLookup.Values) {
|
foreach(Category category in this.categoryLookup.Values) {
|
||||||
for(int index = 0; index < category.Lines.Count; ++index) {
|
for(int index = 0; index < category.Lines.Count; ++index) {
|
||||||
|
@ -107,7 +107,7 @@ namespace Nuclex.Support.Settings {
|
||||||
yield break;
|
yield break;
|
||||||
}
|
}
|
||||||
|
|
||||||
foreach(Option option in this.RootCategory.OptionLookup.Values) {
|
foreach(Option option in this.rootCategory.OptionLookup.Values) {
|
||||||
OptionInfo optionInfo = new OptionInfo() {
|
OptionInfo optionInfo = new OptionInfo() {
|
||||||
Name = option.OptionName.ToString(),
|
Name = option.OptionName.ToString(),
|
||||||
OptionType = getBestMatchingType(ref option.OptionValue)
|
OptionType = getBestMatchingType(ref option.OptionValue)
|
||||||
|
@ -186,7 +186,7 @@ namespace Nuclex.Support.Settings {
|
||||||
|
|
||||||
Category targetCategory;
|
Category targetCategory;
|
||||||
if(string.IsNullOrEmpty(category)) {
|
if(string.IsNullOrEmpty(category)) {
|
||||||
targetCategory = this.RootCategory;
|
targetCategory = this.rootCategory;
|
||||||
} else if(!this.categoryLookup.TryGetValue(category, out targetCategory)) {
|
} else if(!this.categoryLookup.TryGetValue(category, out targetCategory)) {
|
||||||
targetCategory = createCategory(category);
|
targetCategory = createCategory(category);
|
||||||
createOption(targetCategory, optionName, valueAsString);
|
createOption(targetCategory, optionName, valueAsString);
|
||||||
|
@ -237,7 +237,7 @@ namespace Nuclex.Support.Settings {
|
||||||
Category category;
|
Category category;
|
||||||
|
|
||||||
if(string.IsNullOrEmpty(categoryName)) {
|
if(string.IsNullOrEmpty(categoryName)) {
|
||||||
category = this.RootCategory;
|
category = this.rootCategory;
|
||||||
} else if(!this.categoryLookup.TryGetValue(categoryName, out category)) {
|
} else if(!this.categoryLookup.TryGetValue(categoryName, out category)) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
@ -363,7 +363,7 @@ namespace Nuclex.Support.Settings {
|
||||||
private IList<Option> options;
|
private IList<Option> options;
|
||||||
|
|
||||||
/// <summary>Root category where options above any category definition go</summary>
|
/// <summary>Root category where options above any category definition go</summary>
|
||||||
private Category RootCategory;
|
private Category rootCategory;
|
||||||
/// <summary>Lookup table for all categories by their name</summary>
|
/// <summary>Lookup table for all categories by their name</summary>
|
||||||
private IDictionary<string, Category> categoryLookup;
|
private IDictionary<string, Category> categoryLookup;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user