From beecb8aeb1f13a708c824db6b85524df1d8e95b6 Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 11 Oct 2010 15:16:08 +1300 Subject: [PATCH] remove redundant parameter from ObjectCreator.Param attribute --- OpenRA.Game/ObjectCreator.cs | 4 +++- OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs | 4 ++-- OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs | 2 +- OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs | 2 +- OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs | 2 +- OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs | 4 ++-- OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs | 2 +- OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs | 2 +- OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs | 2 +- .../Widgets/Delegates/OrderButtonsChromeDelegate.cs | 2 +- 10 files changed, 14 insertions(+), 12 deletions(-) diff --git a/OpenRA.Game/ObjectCreator.cs b/OpenRA.Game/ObjectCreator.cs index e5ac5ba61c..d346f639d4 100755 --- a/OpenRA.Game/ObjectCreator.cs +++ b/OpenRA.Game/ObjectCreator.cs @@ -67,7 +67,7 @@ namespace OpenRA { var attrs = p[ i ].GetCustomAttributes(); if( attrs.Length != 1 ) throw new InvalidOperationException( "ObjectCreator: argument in [UseCtor] doesn't have [Param]" ); - a[ i ] = args[ attrs[ 0 ].ParamName ]; + a[ i ] = args[ attrs[ 0 ].ParamName ?? p[i].Name ]; } return ctor.Invoke( a ); } @@ -77,6 +77,8 @@ namespace OpenRA { public string ParamName { get; private set; } + public ParamAttribute() { } + public ParamAttribute( string paramName ) { ParamName = paramName; diff --git a/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs b/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs index 3e81c54be7..3631bf48c3 100644 --- a/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/ConnectionDialogsDelegate.cs @@ -15,7 +15,7 @@ namespace OpenRA.Widgets.Delegates public class ConnectionDialogsDelegate : IWidgetDelegate { [ObjectCreator.UseCtor] - public ConnectionDialogsDelegate( [ObjectCreator.Param( "widget" )] Widget widget ) + public ConnectionDialogsDelegate( [ObjectCreator.Param] Widget widget ) { widget.GetWidget("CONNECTION_BUTTON_ABORT").OnMouseUp = mi => { widget.GetWidget("CONNECTION_BUTTON_ABORT").Parent.Visible = false; @@ -31,7 +31,7 @@ namespace OpenRA.Widgets.Delegates public class ConnectionFailedDelegate : IWidgetDelegate { [ObjectCreator.UseCtor] - public ConnectionFailedDelegate( [ObjectCreator.Param( "widget" )] Widget widget ) + public ConnectionFailedDelegate( [ObjectCreator.Param] Widget widget ) { widget.GetWidget("CONNECTION_BUTTON_CANCEL").OnMouseUp = mi => { widget.GetWidget("CONNECTION_BUTTON_CANCEL").Parent.Visible = false; diff --git a/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs b/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs index c2a03fdf38..bb9b550c0c 100644 --- a/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/DeveloperModeDelegate.cs @@ -29,7 +29,7 @@ namespace OpenRA.Widgets.Delegates { readonly World world; [ObjectCreator.UseCtor] - public DeveloperModeDelegate( [ObjectCreator.Param("world")] World world ) + public DeveloperModeDelegate( [ObjectCreator.Param] World world ) { this.world = world; var devmodeBG = Widget.RootWidget.GetWidget("INGAME_ROOT").GetWidget("DEVELOPERMODE_BG"); diff --git a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs b/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs index be37272216..62a00d2c4c 100644 --- a/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/DiplomacyDelegate.cs @@ -23,7 +23,7 @@ namespace OpenRA.Widgets.Delegates int validPlayers = 0; readonly World world; [ObjectCreator.UseCtor] - public DiplomacyDelegate( [ObjectCreator.Param("world")] World world ) + public DiplomacyDelegate( [ObjectCreator.Param] World world ) { this.world = world; var root = Widget.RootWidget.GetWidget("INGAME_ROOT"); diff --git a/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs b/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs index cdde6400c1..acf9bb9469 100755 --- a/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/MainMenuButtonsDelegate.cs @@ -18,7 +18,7 @@ namespace OpenRA.Widgets.Delegates public class MainMenuButtonsDelegate : IWidgetDelegate { [ObjectCreator.UseCtor] - public MainMenuButtonsDelegate( [ObjectCreator.Param( "widget" )] Widget widget ) + public MainMenuButtonsDelegate( [ObjectCreator.Param] Widget widget ) { // Main menu is the default window widget.GetWidget( "MAINMENU_BUTTON_JOIN" ).OnMouseUp = mi => { Widget.OpenWindow( "JOINSERVER_BG" ); return true; }; diff --git a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs index 34e2be4293..44783bf892 100644 --- a/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs +++ b/OpenRA.Game/Widgets/Delegates/ServerBrowserDelegate.cs @@ -24,7 +24,7 @@ namespace OpenRA.Widgets.Delegates Widget ServerTemplate; [ObjectCreator.UseCtor] - public ServerBrowserDelegate( [ObjectCreator.Param( "widget" )] Widget widget ) + public ServerBrowserDelegate( [ObjectCreator.Param] Widget widget ) { var bg = widget.GetWidget("JOINSERVER_BG"); @@ -187,7 +187,7 @@ namespace OpenRA.Widgets.Delegates public class DirectConnectDelegate : IWidgetDelegate { [ObjectCreator.UseCtor] - public DirectConnectDelegate( [ObjectCreator.Param( "widget" )] Widget widget ) + public DirectConnectDelegate( [ObjectCreator.Param] Widget widget ) { var dc = widget.GetWidget("DIRECTCONNECT_BG"); diff --git a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs index c999c93c97..2772c70120 100644 --- a/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs +++ b/OpenRA.Game/Widgets/WorldInteractionControllerWidget.cs @@ -21,7 +21,7 @@ namespace OpenRA.Widgets { readonly World world; [ObjectCreator.UseCtor] - public WorldInteractionControllerWidget( [ObjectCreator.Param( "world" )] World world ) + public WorldInteractionControllerWidget( [ObjectCreator.Param] World world ) { this.world = world; } diff --git a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs index 5ce2f7e143..fef751d25e 100755 --- a/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs +++ b/OpenRA.Mods.RA/Widgets/BuildPaletteWidget.cs @@ -49,7 +49,7 @@ namespace OpenRA.Mods.RA.Widgets readonly World world; [ObjectCreator.UseCtor] - public BuildPaletteWidget( [ObjectCreator.Param("world")] World world ) + public BuildPaletteWidget( [ObjectCreator.Param] World world ) { this.world = world; } diff --git a/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs index 70b3d9cc2d..b5563c3807 100755 --- a/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/IngameChromeDelegate.cs @@ -17,7 +17,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates { readonly World world; [ObjectCreator.UseCtor] - public IngameChromeDelegate( [ObjectCreator.Param("world")] World world ) + public IngameChromeDelegate( [ObjectCreator.Param] World world ) { this.world = world; var r = Widget.RootWidget; diff --git a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs b/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs index 43cfa58ae8..e51cf61a2f 100644 --- a/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs +++ b/OpenRA.Mods.RA/Widgets/Delegates/OrderButtonsChromeDelegate.cs @@ -18,7 +18,7 @@ namespace OpenRA.Mods.RA.Widgets.Delegates { readonly World world; [ObjectCreator.UseCtor] - public OrderButtonsChromeDelegate( [ObjectCreator.Param("world")] World world ) + public OrderButtonsChromeDelegate( [ObjectCreator.Param] World world ) { this.world = world; var r = Widget.RootWidget;