epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #7247 from Hellhake/stylecop-game

Browse Source 
Fix StyleCop warnings in OpenRA.Game
This commit is contained in:
Oliver Brakmann
2015-01-02 12:58:04 +01:00
parent 7fa0a9722a 5a97a4b63b
commit 30e42cdc62
119 changed files with 547 additions and 529 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenRA.Game/Primitives/TypeDictionary.cs
View File

@@ -20,30 +20,30 @@ namespace OpenRA.Primitives
Dictionary<Type, object> dataSingular = new Dictionary<Type, object>();
Dictionary<Type, List<object>> dataMultiple = new Dictionary<Type, List<object>>();
public void Add( object val )
public void Add(object val)
{
var t = val.GetType();
foreach( var i in t.GetInterfaces() )
InnerAdd( i, val );
foreach( var tt in t.BaseTypes() )
InnerAdd( tt, val );
foreach (var i in t.GetInterfaces())
InnerAdd(i, val);
foreach (var tt in t.BaseTypes())
InnerAdd(tt, val);
}
void InnerAdd( Type t, object val )
void InnerAdd(Type t, object val)
{
List<object> objs;
object obj;
if( dataMultiple.TryGetValue( t, out objs ) )
objs.Add( val );
else if( dataSingular.TryGetValue( t, out obj ) )
if (dataMultiple.TryGetValue(t, out objs))
objs.Add(val);
else if (dataSingular.TryGetValue(t, out obj))
{
dataSingular.Remove( t );
dataMultiple.Add( t, new List<object> { obj, val } );
dataSingular.Remove(t);
dataMultiple.Add(t, new List<object> { obj, val });
}
else
dataSingular.Add( t, val );
dataSingular.Add(t, val);
}
public bool Contains<T>()
@@ -83,12 +83,12 @@ namespace OpenRA.Primitives
List<object> objs;
object obj;
if( dataMultiple.TryGetValue( typeof( T ), out objs ) )
if (dataMultiple.TryGetValue(typeof(T), out objs))
return objs.Cast<T>();
else if( dataSingular.TryGetValue( typeof( T ), out obj ) )
else if (dataSingular.TryGetValue(typeof(T), out obj))
return new T[] { (T)obj };
else
return new T[ 0 ];
return new T[0];
}
public IEnumerator GetEnumerator()
@@ -99,9 +99,9 @@ namespace OpenRA.Primitives
public static class TypeExts
{
public static IEnumerable<Type> BaseTypes( this Type t )
public static IEnumerable<Type> BaseTypes(this Type t)
{
while( t != null )
while (t != null)
{
yield return t;
t = t.BaseType;