Author: husted
Date: Mon Jun 27 12:13:48 2005
New Revision: 202032
URL: http://svn.apache.org/viewcvs?rev=202032&view=rev
Log:
OVR-15
* Move text strings to message resource.
Added:
struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs?rev=202032&r1=202031&r2=202032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs Mon Jun 27
12:13:48 2005
@@ -11,7 +11,7 @@
{
public FieldContext () : base ()
{
- ControlTypeName = Tokens.INPUT_CONTROL; // Default
+ ControlTypeName = Tokens.CONTROL_INPUT; // Default
}
public string Alert
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs?rev=202032&r1=202031&r2=202032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs Mon Jun 27 12:13:48 2005
@@ -193,19 +193,19 @@
/// Token for the pre-op command element.
/// </summary>
///
- public const string PRE_OP_ID = "pre-op";
+ public const string ID_PRE_OP = "pre-op";
/// <summary>
/// Token for the post-op command element.
/// </summary>
///
- public const string POST_OP_ID = "post-op";
+ public const string ID_POST_OP = "post-op";
/// <summary>
/// Token for FieldTable command element.
/// </summary>
///
- public const string FIELD_TABLE_ID = "FieldTable";
+ public const string ID_FIELD_TABLE = "FieldTable";
#endregion
@@ -214,13 +214,19 @@
/// <summary>
/// Token for input Control Type Name.
/// </summary>
- public const string INPUT_CONTROL = "input";
+ public const string CONTROL_INPUT = "input";
- /// <summary>
- /// Token for select Control Type Name.
- /// </summary>
- public const string SELECT_CONTROL = "select";
+ #endregion
+
+ #region Hint IDs
+
+ public const string HINT_EDIT = "Hint_Edit";
+
+ public const string HINT_SUCCESS_ADD = "Hint_Success_Add";
+
+ public const string HINT_SUCCESS_EDIT = "Hint_Success_Edit";
+ public const string HINT_SUCCESS_QUIT = "Hint_Success_Quit";
#endregion
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs?rev=202032&r1=202031&r2=202032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs Mon Jun 27
12:13:48 2005
@@ -163,7 +163,7 @@
private IFieldTable GetFieldTable ()
{
if (_FieldTable == null)
- _FieldTable = GetObject (Tokens.FIELD_TABLE_ID)
as IFieldTable;
+ _FieldTable = GetObject (Tokens.ID_FIELD_TABLE)
as IFieldTable;
return _FieldTable;
}
@@ -267,9 +267,9 @@
if (context.IsNominal)
{
IChain chain = new Chain ();
- chain.AddCommand (GetCommand
(Tokens.PRE_OP_ID));
+ chain.AddCommand (GetCommand
(Tokens.ID_PRE_OP));
chain.AddCommand (command);
- chain.AddCommand (GetCommand
(Tokens.POST_OP_ID));
+ chain.AddCommand (GetCommand
(Tokens.ID_POST_OP));
try
{
chain.Execute (context);
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs?rev=202032&r1=202031&r2=202032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs Mon Jun 27
12:13:48 2005
@@ -1,6 +1,7 @@
using System;
using System.Collections;
using System.Web.UI.WebControls;
+using Nexus.Core;
using Nexus.Core.Helpers;
using Nexus.Web;
using Spring.Web.UI;
@@ -93,19 +94,6 @@
}
#endregion
- #region Messages
-
- // ISSUE: Move messages to a default store (when available).
[WNE-60]
- // FIXME: Make these text properties on DataGridHelper.
-
- protected const string msg_ADD_COMMAND = "ADD ITEM";
- protected const string msg_ADD_SUCCESS = "Item added.";
- protected const string msg_EDIT_HINT = "Edit entry, press SAVE.
";
- protected const string msg_QUIT_SUCCESS = "Change cancelled. ";
- protected const string msg_SAVE_SUCCESS = "Changes saved.";
-
- #endregion
-
#region Page Properties
/// <summary>
@@ -265,7 +253,7 @@
if (okay)
{
//
Template_Load(h.TitleText,h.HeadingText,h.PromptText);
- cmdListAdd.Text = msg_ADD_COMMAND;
+ // cmdListAdd.Text = msg_ADD_COMMAND;
pnlList.Visible = true;
}
else
@@ -311,7 +299,7 @@
/// <param name="index">Index of selected entry</param>
protected virtual void List_Edit (int index)
{
- Page_Prompt = msg_EDIT_HINT;
+ Page_Prompt = GetMessage(Tokens.HINT_EDIT);
List_ItemIndex = index;
List_Refresh ();
}
@@ -321,7 +309,7 @@
/// </summary>
protected virtual void List_Quit ()
{
- Page_Prompt = msg_QUIT_SUCCESS;
+ Page_Prompt = GetMessage(Tokens.HINT_SUCCESS_QUIT);
List_Insert = false;
List_ItemIndex = -1;
List_Refresh ();
@@ -340,7 +328,7 @@
if (okay)
{
okay = h.List (repList);
- Page_Prompt = (List_Insert) ? msg_ADD_SUCCESS :
msg_SAVE_SUCCESS;
+ Page_Prompt = (List_Insert) ?
GetMessage(Tokens.HINT_SUCCESS_ADD) : GetMessage(Tokens.HINT_SUCCESS_EDIT);
List_Insert = false;
List_ItemIndex = -1;
List_Refresh ();
@@ -368,7 +356,7 @@
bool okay = h.DataInsert (repList);
if (okay)
{
- Page_Prompt = msg_EDIT_HINT;
+ Page_Prompt = GetMessage(Tokens.HINT_EDIT);
List_Insert = true;
List_ItemIndex = 0;
pnlList.Visible = true;
@@ -517,6 +505,16 @@
if (pnlList.Visible)
List_Load ();
+ }
+
+ /// <summary>
+ /// Set text messages.
+ /// </summary>
+ /// <param name="sender">Source</param>
+ /// <param name="e">Event</param>
+ protected virtual void Page_PreRender(object sender, EventArgs
e)
+ {
+ cmdListAdd.Text = GetMessage("cmdListAdd.Text");
}
#endregion
Added: struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx?rev=202032&view=auto
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx (added)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/Messages.resx Mon Jun 27 12:13:48
2005
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+ <xsd:schema id="root" xmlns=""
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true";>
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element
name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"; />
+ <xsd:element
name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2"; />
+ </xsd:sequence>
+ <xsd:attribute
name="name" type="xsd:string" />
+ <xsd:attribute
name="type" type="xsd:string" />
+ <xsd:attribute
name="mimetype" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element
name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1"; />
+ </xsd:sequence>
+ <xsd:attribute
name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="ResMimeType">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="Version">
+ <value>1.0.0.0</value>
+ </resheader>
+ <resheader name="Reader">
+ <value>System.Resources.ResXResourceReader,
System.Windows.Forms, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="Writer">
+ <value>System.Resources.ResXResourceWriter,
System.Windows.Forms, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+
+ <data name="Hint_Edit">
+ <value>Edit entry, press SAVE. </value>
+ </data>
+
+ <data name="Hint_Success_Add">
+ <value>Item added. </value>
+ </data>
+
+ <data name="Hint_Success_Edit">
+ <value>Changes saved. </value>
+ </data>
+
+ <data name="Hint_Success_Quit">
+ <value>Change cancelled. </value>
+ </data>
+
+ <data name="cmdListAdd.Text">
+ <value>ADD ITEM</value>
+ </data>
+
+</root>
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj?rev=202032&r1=202031&r2=202032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj Mon Jun 27 12:13:48 2005
@@ -18,7 +18,7 @@
OutputType = "Library"
PreBuildEvent = ""
PostBuildEvent = ""
- RootNamespace = "Nexus"
+ RootNamespace = "Nexus.Web"
RunPostBuildEvent = "OnBuildSuccess"
StartupObject = ""
>
@@ -159,6 +159,10 @@
RelPath = "IGridViewHelper.cs"
SubType = "Code"
BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Messages.resx"
+ BuildAction = "EmbeddedResource"
/>
<File
RelPath = "Web.config"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
