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

Merge pull request #7245 from Hellhake/stylecop-rest

Browse Source 
Fix StyleCop warnings in Editor, Renderer.Sdl2, Utility, Test
This commit is contained in:
Matthias Mailänder
2015-01-02 16:53:22 +01:00
parent 167ba72119 7f06c4123a
commit cddb956fee
10 changed files with 37 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@@ -191,6 +191,16 @@ check:
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k @mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.D2k
@echo "Checking for code style violations in OpenRA.Mods.TS..." @echo "Checking for code style violations in OpenRA.Mods.TS..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.TS @mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Mods.TS
@echo "Checking for code style violations in OpenRA.Editor..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Editor
@echo "Checking for code style violations in OpenRA.Renderer.Sdl2..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Renderer.Sdl2
@echo "Checking for code style violations in OpenRA.Utility..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Utility
@echo "Checking for code style violations in OpenRA.Test..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.Test
@echo "Checking for code style violations in OpenRA.TilesetBuilder..."
@mono --debug OpenRA.Utility.exe cnc --check-code-style OpenRA.TilesetBuilder
# Builds and exports tilesets from a bitmap # Builds and exports tilesets from a bitmap
tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs') tsbuild_SRCS := $(shell find OpenRA.TilesetBuilder/ -iname '*.cs')

4
OpenRA.Editor/Form1.cs
View File

@@ -426,7 +426,7 @@ namespace OpenRA.Editor
pd.TitleBox.Text = surface1.Map.Title; pd.TitleBox.Text = surface1.Map.Title;
pd.DescBox.Text = surface1.Map.Description; pd.DescBox.Text = surface1.Map.Description;
pd.AuthorBox.Text = surface1.Map.Author; pd.AuthorBox.Text = surface1.Map.Author;
pd.mapVisibilityComboBox.SelectedIndex = pd.mapVisibilityComboBox.FindStringExact(Enum.GetName(typeof(MapVisibility), surface1.Map.Visibility)); pd.MapVisibilityComboBox.SelectedIndex = pd.MapVisibilityComboBox.FindStringExact(Enum.GetName(typeof(MapVisibility), surface1.Map.Visibility));
if (DialogResult.OK != pd.ShowDialog()) if (DialogResult.OK != pd.ShowDialog())
return; return;
@@ -434,7 +434,7 @@ namespace OpenRA.Editor
surface1.Map.Title = pd.TitleBox.Text; surface1.Map.Title = pd.TitleBox.Text;
surface1.Map.Description = pd.DescBox.Text; surface1.Map.Description = pd.DescBox.Text;
surface1.Map.Author = pd.AuthorBox.Text; surface1.Map.Author = pd.AuthorBox.Text;
surface1.Map.Visibility = (MapVisibility)Enum.Parse(typeof(MapVisibility), pd.mapVisibilityComboBox.SelectedItem.ToString()); surface1.Map.Visibility = (MapVisibility)Enum.Parse(typeof(MapVisibility), pd.MapVisibilityComboBox.SelectedItem.ToString());
} }
} }

18
OpenRA.Editor/PropertiesDialog.Designer.cs generated
View File

@@ -45,7 +45,7 @@ namespace OpenRA.Editor
this.DescBox = new System.Windows.Forms.TextBox(); this.DescBox = new System.Windows.Forms.TextBox();
this.label3 = new System.Windows.Forms.Label(); this.label3 = new System.Windows.Forms.Label();
this.AuthorBox = new System.Windows.Forms.TextBox(); this.AuthorBox = new System.Windows.Forms.TextBox();
this.mapVisibilityComboBox = new System.Windows.Forms.ComboBox(); this.MapVisibilityComboBox = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label(); this.label4 = new System.Windows.Forms.Label();
this.SuspendLayout(); this.SuspendLayout();
// //
@@ -122,15 +122,15 @@ namespace OpenRA.Editor
// //
// mapVisibilityComboBox // mapVisibilityComboBox
// //
this.mapVisibilityComboBox.FormattingEnabled = true; this.MapVisibilityComboBox.FormattingEnabled = true;
this.mapVisibilityComboBox.Items.AddRange(new object[] { this.MapVisibilityComboBox.Items.AddRange(new object[] {
"Lobby", "Lobby",
"Shellmap", "Shellmap",
"MissionSelector"}); "MissionSelector"});
this.mapVisibilityComboBox.Location = new System.Drawing.Point(150, 137); this.MapVisibilityComboBox.Location = new System.Drawing.Point(150, 137);
this.mapVisibilityComboBox.Name = "mapVisibilityComboBox"; this.MapVisibilityComboBox.Name = "mapVisibilityComboBox";
this.mapVisibilityComboBox.Size = new System.Drawing.Size(121, 21); this.MapVisibilityComboBox.Size = new System.Drawing.Size(121, 21);
this.mapVisibilityComboBox.TabIndex = 19; this.MapVisibilityComboBox.TabIndex = 19;
// //
// label4 // label4
// //
@@ -148,7 +148,7 @@ namespace OpenRA.Editor
this.CancelButton = this.button1; this.CancelButton = this.button1;
this.ClientSize = new System.Drawing.Size(370, 228); this.ClientSize = new System.Drawing.Size(370, 228);
this.Controls.Add(this.label4); this.Controls.Add(this.label4);
this.Controls.Add(this.mapVisibilityComboBox); this.Controls.Add(this.MapVisibilityComboBox);
this.Controls.Add(this.AuthorBox); this.Controls.Add(this.AuthorBox);
this.Controls.Add(this.label3); this.Controls.Add(this.label3);
this.Controls.Add(this.DescBox); this.Controls.Add(this.DescBox);
@@ -176,7 +176,7 @@ namespace OpenRA.Editor
public System.Windows.Forms.TextBox DescBox; public System.Windows.Forms.TextBox DescBox;
private System.Windows.Forms.Label label3; private System.Windows.Forms.Label label3;
public System.Windows.Forms.TextBox AuthorBox; public System.Windows.Forms.TextBox AuthorBox;
public System.Windows.Forms.ComboBox mapVisibilityComboBox; public System.Windows.Forms.ComboBox MapVisibilityComboBox;
private System.Windows.Forms.Label label4; private System.Windows.Forms.Label label4;
} }
} }

1
OpenRA.Editor/Surface.cs
View File

@@ -319,6 +319,7 @@ namespace OpenRA.Editor
ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red); ControlPaint.DrawGrid(g, rect, new Size(ts.Width, ts.Height), Color.Red);
} }
} }
return bitmap; return bitmap;
} }

7
OpenRA.Renderer.Sdl2/ErrorHandler.cs
View File

@@ -56,9 +56,12 @@ namespace OpenRA.Renderer.Sdl2
Log.Write("graphics", "Vendor: {0}", GL.GetString(StringName.Vendor)); Log.Write("graphics", "Vendor: {0}", GL.GetString(StringName.Vendor));
if (GL.GetString(StringName.Vendor).Contains("Microsoft")) if (GL.GetString(StringName.Vendor).Contains("Microsoft"))
{ {
Log.Write("graphics", "Note: The default driver provided by Microsoft does not include full OpenGL support.\n" var msg = "";
+ "Please install the latest drivers from your graphics card manufacturer's website.\n"); msg += "Note: The default driver provided by Microsoft does not include full OpenGL support.\n";
msg += "Please install the latest drivers from your graphics card manufacturer's website.\n";
Log.Write("graphics", msg);
} }
Log.Write("graphics", "Renderer: {0}", GL.GetString(StringName.Renderer)); Log.Write("graphics", "Renderer: {0}", GL.GetString(StringName.Renderer));
Log.Write("graphics", "GL Version: {0}", GL.GetString(StringName.Version)); Log.Write("graphics", "GL Version: {0}", GL.GetString(StringName.Version));
Log.Write("graphics", "Shader Version: {0}", GL.GetString(StringName.ShadingLanguageVersion)); Log.Write("graphics", "Shader Version: {0}", GL.GetString(StringName.ShadingLanguageVersion));

2
OpenRA.Renderer.Sdl2/Sdl2GraphicsDevice.cs
View File

@@ -157,11 +157,13 @@ namespace OpenRA.Renderer.Sdl2
SDL.SDL_GL_DeleteContext(context); SDL.SDL_GL_DeleteContext(context);
context = IntPtr.Zero; context = IntPtr.Zero;
} }
if (window != IntPtr.Zero) if (window != IntPtr.Zero)
{ {
SDL.SDL_DestroyWindow(window); SDL.SDL_DestroyWindow(window);
window = IntPtr.Zero; window = IntPtr.Zero;
} }
SDL.SDL_Quit(); SDL.SDL_Quit();
} }

1
OpenRA.Renderer.Sdl2/Texture.cs
View File

@@ -34,6 +34,7 @@ namespace OpenRA.Renderer.Sdl2
{ {
return scaleFilter; return scaleFilter;
} }
set set
{ {
if (scaleFilter == value) if (scaleFilter == value)

9
OpenRA.Test/OpenRA.Game/ActorInfoTest.cs
View File

@@ -10,11 +10,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using NUnit.Framework;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
using NUnit.Framework;
namespace OpenRA.Test namespace OpenRA.Test
{ {
@@ -48,7 +48,7 @@ namespace OpenRA.Test
actorInfo.Traits.Add(new MockB()); actorInfo.Traits.Add(new MockB());
actorInfo.Traits.Add(new MockA()); actorInfo.Traits.Add(new MockA());
var i = new List<ITraitInfo> (actorInfo.TraitsInConstructOrder()); var i = new List<ITraitInfo>(actorInfo.TraitsInConstructOrder());
Assert.That(i[0], Is.InstanceOf<MockA>()); Assert.That(i[0], Is.InstanceOf<MockA>());
Assert.That(i[1], Is.InstanceOf<MockB>()); Assert.That(i[1], Is.InstanceOf<MockB>());
@@ -93,8 +93,7 @@ namespace OpenRA.Test
var count = ( var count = (
new Regex("MockD").Matches(e.Message).Count + new Regex("MockD").Matches(e.Message).Count +
new Regex("MockE").Matches(e.Message).Count + new Regex("MockE").Matches(e.Message).Count +
new Regex("MockF").Matches(e.Message).Count new Regex("MockF").Matches(e.Message).Count) / 3.0;
) / 3.0;
Assert.That(count, Is.EqualTo(Math.Floor(count)), "Should be symmetrical"); Assert.That(count, Is.EqualTo(Math.Floor(count)), "Should be symmetrical");
} }

4
OpenRA.Test/OpenRA.Game/MiniYamlTest.cs
View File

@@ -10,11 +10,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text.RegularExpressions;
using System.Linq; using System.Linq;
using System.Text.RegularExpressions;
using NUnit.Framework;
using OpenRA.GameRules; using OpenRA.GameRules;
using OpenRA.Traits; using OpenRA.Traits;
using NUnit.Framework;
namespace OpenRA.Test namespace OpenRA.Test
{ {

2
OpenRA.Utility/Program.cs
View File

@@ -50,7 +50,7 @@ namespace OpenRA.Utility
try try
{ {
var action = Exts.WithDefault((a,b) => PrintUsage(actions), () => actions[args[0]]); var action = Exts.WithDefault((a, b) => PrintUsage(actions), () => actions[args[0]]);
action(modData, args); action(modData, args);
} }
catch (Exception e) catch (Exception e)