Author: husted Date: Mon Jun 27 17:06:24 2005 New Revision: 202101 URL: http://svn.apache.org/viewcvs?rev=202101&view=rev Log: OVR-11 * Change DaetaGridViewHelper to use the Spring message resource for the command button labels.
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs?rev=202101&r1=202100&r2=202101&view=diff ============================================================================== --- struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs (original) +++ struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs Mon Jun 27 17:06:24 2005 @@ -218,7 +218,7 @@ #endregion - #region Hint IDs + #region Message keys (GridViewHelper) /// <summary> /// Token for Edit hint. @@ -240,6 +240,33 @@ /// </summary> public const string HINT_SUCCESS_QUIT = "hint_success_quit"; + /// <summary> + /// Token for Entry Edit command. + /// </summary> + public const string ENTRY_EDIT_COMMAND = "entry_edit_command"; + + /// <summary> + /// Token for Entry Quit command. + /// </summary> + public const string ENTRY_QUIT_COMMAND = "entry_quit_command"; + + /// <summary> + /// Token for Entry Save command. + /// </summary> + public const string ENTRY_SAVE_COMMAND = "entry_save_command"; + + /// <summary> + /// Token for Entry Item command. + /// </summary> + public const string ENTRY_ITEM_COMMAND = "entry_item_command"; + + /// <summary> + /// Token for Entry Item command name. + /// </summary> + public const string ENTRY_ITEM_COMMAND_NAME = "entry_item_command_name"; + #endregion + + } } Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs?rev=202101&r1=202100&r2=202101&view=diff ============================================================================== --- struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs (original) +++ struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs Mon Jun 27 17:06:24 2005 @@ -7,6 +7,7 @@ using Nexus.Core.Tables; using Nexus.Web; using Nexus.Web.Helpers; +using Spring.Context; namespace Nexus { @@ -15,6 +16,7 @@ /// </summary> public abstract class GridViewHelper : WebViewHelper, IGridViewHelper { + #region IViewHelper /// <remarks><p> @@ -30,11 +32,6 @@ #region IListViewHelper - public const string msg_EDIT_TEXT = "EDIT"; - public const string msg_QUIT_TEXT = "CANCEL"; - public const string msg_SAVE_TEXT = "SAVE"; - public const string msg_ITEM_TEXT = "#"; - public const string msg_ITEM_COMMAND = "cmdItem"; private IViewHelper _SaveHelper; public virtual IViewHelper SaveHelper @@ -77,47 +74,72 @@ set { _HasCriteria = value; } } - private string _EditText = msg_EDIT_TEXT; + private string _DataKeyField; + public virtual string DataKeyField + { + get { return _DataKeyField; } + set { _DataKeyField = value; } + } + + #region text properties + + private IMessageSource _MessageSource; + /// <summary> + /// Identify the message source for this FieldContext. + /// </summary> + /// <exception cref="System.InvalidOperationException"> + /// If the context has not been initialized yet. + /// </exception> + public IMessageSource MessageSource + { + get{ return _MessageSource; } + set{ _MessageSource = value; } + } + + /// <summary> + /// Resolve the message. + /// </summary> + /// <param name="name">The name of the resource to get.</param> + /// <returns> + /// The resolved message if the lookup was successful. Otherwise, it either throws + /// an exception or returns the resource name, depending on the implementation. + /// </returns> + private string GetMessage(string name) + { + return MessageSource.GetMessage(name); + } + public virtual string EditText { - get { return _EditText; } - set { _EditText = value; } + get { return GetMessage(Tokens.ENTRY_EDIT_COMMAND); } + set { throw new NotSupportedException(); } } - private string _QuitText = msg_QUIT_TEXT; public virtual string QuitText { - get { return _QuitText; } - set { _QuitText = value; } + get { return GetMessage(Tokens.ENTRY_QUIT_COMMAND); } + set { throw new NotSupportedException(); } } - private string _SaveText = msg_SAVE_TEXT; public virtual string SaveText { - get { return _SaveText; } - set { _SaveText = value; } + get { return GetMessage(Tokens.ENTRY_SAVE_COMMAND); } + set { throw new NotSupportedException(); } } - private string _ItemText = msg_ITEM_TEXT; public virtual string ItemText { - get { return _ItemText; } - set { _ItemText = value; } + get { return GetMessage(Tokens.ENTRY_ITEM_COMMAND); } + set { throw new NotSupportedException(); } } - private string _ItemCommandName = msg_ITEM_COMMAND; public virtual string ItemCommandName { - get { return _ItemCommandName as string; } - set { _ItemCommandName = value; } + get { return GetMessage(Tokens.ENTRY_ITEM_COMMAND_NAME); } + set { throw new NotSupportedException(); } } - private string _DataKeyField; - public virtual string DataKeyField - { - get { return _DataKeyField; } - set { _DataKeyField = value; } - } + #endregion #endregion Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx?rev=202101&r1=202100&r2=202101&view=diff ============================================================================== --- struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx (original) +++ struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx Mon Jun 27 17:06:24 2005 @@ -40,6 +40,29 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> + + <!-- Any of these values can be overridden in the host application. Load the host resources FIRST! --> + + <data name="entry_edit_command"> + <value>EDIT</value> + </data> + + <data name="entry_quit_command"> + <value>QUIT</value> + </data> + + <data name="entry_save_command"> + <value>SAVE</value> + </data> + + <data name="entry_item_command"> + <value>#</value> + </data> + + <data name="entry_item_command_name"> + <value>item_command</value> + </data> + <data name="hint_edit"> <value>Edit entry, press SAVE. </value> </data> @@ -59,5 +82,6 @@ <data name="list_add_command"> <value>ADD ITEM</value> </data> + </root> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]