From 32cbe4620f85d0de14bac4df834f89d69559c6f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sun, 4 Aug 2013 08:59:47 +0200 Subject: [PATCH] StyleCop clean IniFile --- OpenRA.FileFormats/FileFormats/IniFile.cs | 92 +++++++++++------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/OpenRA.FileFormats/FileFormats/IniFile.cs b/OpenRA.FileFormats/FileFormats/IniFile.cs index cebeb44be5..2ab2238b3d 100644 --- a/OpenRA.FileFormats/FileFormats/IniFile.cs +++ b/OpenRA.FileFormats/FileFormats/IniFile.cs @@ -20,93 +20,93 @@ namespace OpenRA.FileFormats { Dictionary sections = new Dictionary(); - public IniFile( Stream s ) + public IniFile(Stream s) { - Load( s ); + Load(s); } - public IniFile( params Stream[] streams ) + public IniFile(params Stream[] streams) { - foreach( var s in streams ) - Load( s ); + foreach (var s in streams) + Load(s); } - public void Load( Stream s ) + public void Load(Stream s) { - StreamReader reader = new StreamReader( s ); + StreamReader reader = new StreamReader(s); IniSection currentSection = null; - while( !reader.EndOfStream ) + while (!reader.EndOfStream) { - string line = reader.ReadLine(); + var line = reader.ReadLine(); - if( line.Length == 0 ) continue; + if (line.Length == 0) continue; - switch( line[ 0 ] ) + switch (line[0]) { case ';': break; - case '[': currentSection = ProcessSection( line ); break; - default: ProcessEntry( line, currentSection ); break; + case '[': currentSection = ProcessSection(line); break; + default: ProcessEntry(line, currentSection); break; } } } - Regex sectionPattern = new Regex( @"^\[([^]]*)\]" ); + Regex sectionPattern = new Regex(@"^\[([^]]*)\]"); - IniSection ProcessSection( string line ) + IniSection ProcessSection(string line) { - Match m = sectionPattern.Match( line ); - if( m == null || !m.Success ) + Match m = sectionPattern.Match(line); + if (m == null || !m.Success) return null; - string sectionName = m.Groups[ 1 ].Value.ToLowerInvariant(); + string sectionName = m.Groups[1].Value.ToLowerInvariant(); IniSection ret; - if( !sections.TryGetValue( sectionName, out ret ) ) - sections.Add( sectionName, ret = new IniSection( sectionName ) ); + if (!sections.TryGetValue(sectionName, out ret)) + sections.Add(sectionName, ret = new IniSection(sectionName)); return ret; } - bool ProcessEntry( string line, IniSection currentSection ) + bool ProcessEntry(string line, IniSection currentSection) { - int comment = line.IndexOf( ';' ); - if( comment >= 0 ) - line = line.Substring( 0, comment ); + var comment = line.IndexOf(';'); + if (comment >= 0) + line = line.Substring(0, comment); line = line.Trim(); - if( line.Length == 0 ) + if (line.Length == 0) return false; var key = line; var value = ""; - int eq = line.IndexOf( '=' ); - if( eq >= 0 ) + int eq = line.IndexOf('='); + if (eq >= 0) { - key = line.Substring( 0, eq ); - value = line.Substring( eq + 1, line.Length - eq - 1 ); + key = line.Substring(0, eq); + value = line.Substring(eq + 1, line.Length - eq - 1); } - if( currentSection == null ) - throw new InvalidOperationException( "No current INI section" ); + if (currentSection == null) + throw new InvalidOperationException("No current INI section"); - if( !currentSection.Contains( key ) ) - currentSection.Add( key, value ); + if (!currentSection.Contains(key)) + currentSection.Add(key, value); return true; } - public IniSection GetSection( string s ) + public IniSection GetSection(string s) { - return GetSection( s, false ); + return GetSection(s, false); } - public IniSection GetSection( string s, bool allowFail ) + public IniSection GetSection(string s, bool allowFail) { IniSection section; - if( sections.TryGetValue( s.ToLowerInvariant(), out section ) ) + if (sections.TryGetValue(s.ToLowerInvariant(), out section)) return section; - if( allowFail ) - return new IniSection( s ); - throw new InvalidOperationException( "Section does not exist in map or rules: " + s ); + if (allowFail) + return new IniSection(s); + throw new InvalidOperationException("Section does not exist in map or rules: " + s); } public IEnumerable Sections { get { return sections.Values; } } @@ -117,25 +117,25 @@ namespace OpenRA.FileFormats public string Name { get; private set; } Dictionary values = new Dictionary(); - public IniSection( string name ) + public IniSection(string name) { Name = name; } - public void Add( string key, string value ) + public void Add(string key, string value) { values[key] = value; } - public bool Contains( string key ) + public bool Contains(string key) { - return values.ContainsKey( key ); + return values.ContainsKey(key); } - public string GetValue( string key, string defaultValue ) + public string GetValue(string key, string defaultValue) { string s; - return values.TryGetValue( key, out s ) ? s : defaultValue; + return values.TryGetValue(key, out s) ? s : defaultValue; } public IEnumerator> GetEnumerator()