You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by hu...@apache.org on 2005/10/06 17:28:56 UTC
svn commit: r306772 - in /struts/sandbox/trunk/overdrive/Nexus:
Core/Validators/ Extras/Spring/ Test/bin/Debug/ Web/
Author: husted
Date: Thu Oct 6 08:28:39 2005
New Revision: 306772
URL: http://svn.apache.org/viewcvs?rev=306772&view=rev
Log:
* Changes to XML Docs
* Changes permission of Critieria to private.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorContext.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.dll
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.pdb
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.xml
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.dll
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.pdb
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.xml
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Test.dll
struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Test.pdb
struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorContext.cs?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorContext.cs Thu Oct 6 08:28:39 2005
@@ -23,7 +23,7 @@
object Source { get; set; }
/// <summary>
- /// Reorod the target value after conversion or formatting.
+ /// Record the target value after conversion or formatting.
/// </summary>
///
object Target { get; set; }
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs Thu Oct 6 08:28:39 2005
@@ -32,7 +32,7 @@
/// To provide a default Alert or Required to use when no other is provided,
/// provide a Message Resource entry in the form: "_alert" or "_required".
/// </p><p>
- /// If a Label mesasge is not found, the FieldContext ID is returned instead.
+ /// If a Label message is not found, the FieldContext ID is returned instead.
/// Otherwise, if no message is found,
/// then the FieldContext ID and property tag (e.g. "LastName_required")
/// is returned.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.dll
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.dll?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.pdb
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.pdb?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.xml?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.xml (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Core.xml Thu Oct 6 08:28:39 2005
@@ -913,7 +913,7 @@
</member>
<member name="P:Nexus.Core.Validators.IProcessorContext.Target">
<summary>
- Reorod the target value after conversion or formatting.
+ Record the target value after conversion or formatting.
</summary>
</member>
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.dll
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.dll?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.pdb
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.pdb?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.xml?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.xml (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Extras.xml Thu Oct 6 08:28:39 2005
@@ -68,7 +68,7 @@
To provide a default Alert or Required to use when no other is provided,
provide a Message Resource entry in the form: "_alert" or "_required".
</p><p>
- If a Label mesasge is not found, the FieldContext ID is returned instead.
+ If a Label message is not found, the FieldContext ID is returned instead.
Otherwise, if no message is found,
then the FieldContext ID and property tag (e.g. "LastName_required")
is returned.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Test.dll
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Test.dll?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Test.pdb
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/bin/Debug/Nexus.Test.pdb?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
Binary files - no diff available.
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Thu Oct 6 08:28:39 2005
@@ -19,7 +19,7 @@
/// <summary>
/// Values to use with a query statement.
/// </summary>
- public virtual IDictionary list_Criteria
+ private IDictionary list_Criteria
{
get
{
@@ -672,6 +672,12 @@
base.Page_Reset();
}
+ /// <summary>
+ /// Handle the page's Load event.
+ /// </summary>
+ /// <param name="sender">Event source</param>
+ /// <param name="e">Runtime arguments</param>
+ ///
private void Page_Load(object sender, EventArgs e)
{
Grid.AutoGenerateColumns = false;
@@ -686,6 +692,11 @@
#region Web Form Designer generated code
+ /// <summary>
+ /// Initialize components.
+ /// </summary>
+ /// <param name="e">Runtime parameters</param>
+ ///
protected override void OnInit(EventArgs e)
{
//
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs?rev=306772&r1=306771&r2=306772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs Thu Oct 6 08:28:39 2005
@@ -207,6 +207,68 @@
#endregion
+ #region ViewState methods
+
+ /// <summary>
+ /// Token under which to store the array of primary keys.
+ /// </summary>
+ ///
+ private const string KEYS = "Keys";
+
+ /// <summary>
+ /// Set an array of primary keys to the view state.
+ /// </summary>
+ /// <param name="keys">.</param>
+ ///
+ protected void SetKeyIndex(string[] keys)
+ {
+ ViewState[KEYS] = keys;
+ }
+
+ /// <summary>
+ /// Return the nth key from the array kept in view state.
+ /// </summary>
+ /// <param name="index">Array index for the primary key (corresponds to index of the DataGrid).</param>
+ /// <returns>Nth key from primary key array kept in view state.</returns>
+ protected string GetKeyIndex(int index)
+ {
+ string[] keys = (string[]) ViewState[KEYS];
+ return keys[index];
+ }
+
+ /// <summary>
+ /// Return the primary key for the current item index of the DataGrid.
+ /// </summary>
+ /// <param name="e">DataGrid event arguments.</param>
+ /// <param name="offset">Number of items on prior pages, if any (page*pagesize).</param>
+ /// <returns>The primary key for the current item index of the DataGrid.</returns>
+ protected string GetKeyIndex(DataGridCommandEventArgs e, int offset)
+ {
+ return GetKeyIndex(e.Item.ItemIndex + offset);
+ }
+
+ /// <summary>
+ /// Return the index for the given key,
+ /// usually so that it can be selected.
+ /// </summary>
+ /// <param name="list">List of KeyValue entries.</param>
+ /// <param name="key">A key value from the list</param>
+ /// <returns>-1 if not found</returns>
+ ///
+ protected int IndexForKey (IList list, string key)
+ {
+ int i = 0;
+ foreach (KeyValue row in list)
+ {
+ if (key.Equals (row.Key))
+ return i;
+ i++;
+ }
+ return -1;
+ }
+
+ #endregion
+
#region IViewControl methods
public void ResetControls()
@@ -276,6 +338,18 @@
else
BindListControl(x, s, r);
}
+ if (IsCheckBox(t))
+ {
+ CheckBox x = (CheckBox) t;
+ object v = dictionary[ToColumn(x.ID, prefix)];
+ if (v != null) x.Checked = true;
+ }
+ if (IsRadioButton(t))
+ {
+ RadioButton x = (RadioButton) t;
+ object v = dictionary[ToColumn(x.ID, prefix)];
+ if (v != null) x.Checked = true;
+ }
}
}
@@ -339,12 +413,14 @@
TextBox x = (TextBox) t;
string value = (nullOnEmpty) ? NullOnEmpty(x.Text) : x.Text;
dictionary.Add(ToColumn(x.ID, prefix), value);
+ continue;
}
if (IsLabel(t))
{
Label x = (Label) t;
string value = (nullOnEmpty) ? NullOnEmpty(x.Text) : x.Text;
dictionary.Add(ToColumn(x.ID, prefix), value);
+ continue;
}
if (IsListControl(t))
{
@@ -352,6 +428,7 @@
string root = RootId(x.ID, prefix, list_suffix);
string value = (nullOnEmpty) ? NullOnEmpty(x.SelectedValue) : x.SelectedValue;
dictionary.Add(root, value);
+ continue;
}
if (IsCheckBox(t))
{
@@ -359,6 +436,7 @@
string key = ToColumn(x.ID, prefix);
string value = (x.Checked) ? key : null;
dictionary.Add(key, value);
+ continue;
}
if (IsRadioButton(t))
{
@@ -366,6 +444,7 @@
string key = ToColumn(x.ID, prefix);
string value = (x.Checked) ? key : null;
dictionary.Add(key, value);
+ continue;
}
}
}
@@ -458,10 +537,17 @@
{
foreach (Control t in controls)
{
+ if (IsLabel(t))
+ {
+ Label x = (Label) t;
+ x.Text = GetMessage(x.ID);
+ continue;
+ }
if (IsButton(t))
{
Button x = (Button) t;
x.Text = GetMessage(x.ID);
+ continue;
}
if (IsHyperLink(t))
{
@@ -470,11 +556,6 @@
x.NavigateUrl = GetMessage(x.ID + LINK);
continue;
}
- if (IsLabel(t))
- {
- Label x = (Label) t;
- x.Text = GetMessage(x.ID);
- }
}
}
@@ -605,6 +686,12 @@
GetMessages();
}
+ /// <summary>
+ /// Handle the page's Load event.
+ /// </summary>
+ /// <param name="sender">Event source</param>
+ /// <param name="e">Runtime arguments</param>
+ ///
private void Page_Load(object sender, EventArgs e)
{
// Put user code to initialize the page here
@@ -612,6 +699,11 @@
#region Web Form Designer generated code
+ /// <summary>
+ /// Initialize components.
+ /// </summary>
+ /// <param name="e">Runtime parameters</param>
+ ///
protected override void OnInit(EventArgs e)
{
//
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org