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/11/15 23:07:53 UTC
svn commit: r344453 - in /struts/sandbox/trunk/overdrive/Nexus: Core/
Core/Profile/ Core/Tables/ Extras/Spring/ Web/ Web/Controls/
Author: husted
Date: Tue Nov 15 14:07:37 2005
New Revision: 344453
URL: http://svn.apache.org/viewcvs?rev=344453&view=rev
Log:
OVR-22
* Reformat code only; no changes.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/IKeyValueList.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs
struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldTable.cs
struts/sandbox/trunk/overdrive/Nexus/Web/AlertLabel.cs
struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/FindControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/HintLabel.cs
struts/sandbox/trunk/overdrive/Nexus/Web/TextLabel.cs
struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/ViewLabel.cs
struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IKeyValueList.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IKeyValueList.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IKeyValueList.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IKeyValueList.cs Tue Nov 15 14:07:37 2005
@@ -7,6 +7,6 @@
/// </summary>
public interface IKeyValueList : IList
{
- string ValueFor(string key);
+ string ValueFor(string key);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs Tue Nov 15 14:07:37 2005
@@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System;
using System.Collections;
using Agility.Core;
using Nexus.Core.Helpers;
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs Tue Nov 15 14:07:37 2005
@@ -31,7 +31,7 @@
public string ValueFor(string key)
{
- if ((key==null) || (key.Equals(String.Empty))) return key;
+ if ((key == null) || (key.Equals(String.Empty))) return key;
foreach (IKeyValue kv in this)
{
if (key.Equals(kv.Key)) return kv.Value as string;
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs Tue Nov 15 14:07:37 2005
@@ -111,7 +111,7 @@
{
get
{
- if (_Criteria==null)
+ if (_Criteria == null)
_Criteria = new Hashtable();
return _Criteria;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs Tue Nov 15 14:07:37 2005
@@ -39,7 +39,7 @@
field.ID = id;
return field;
}
-
+
public virtual IFieldContext AddFieldContext
{
set
@@ -66,13 +66,13 @@
if (id == null) throw new ArgumentNullException("id==null", "Nexus.Core.Tables.FieldTable.GetFieldContext");
IFieldContext fieldContext = Field[id] as IFieldContext;
bool missing = (fieldContext == null);
- if (missing)
+ if (missing)
if (Strict)
throw new ArgumentNullException(id, "Nexus.Core.Tables.FieldTable.GetFieldContext");
- else
- {
- System.Object lockThis = new System.Object();
- lock(lockThis)
+ else
+ {
+ Object lockThis = new Object();
+ lock (lockThis)
{
fieldContext = NewFieldContext(id);
AddFieldContext = fieldContext;
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldTable.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldTable.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldTable.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldTable.cs Tue Nov 15 14:07:37 2005
@@ -6,9 +6,8 @@
/// <summary>
/// Companion to Nexus.Extras.Spring.FieldContext.
/// </summary>
- public class FieldTable : Nexus.Core.Tables.FieldTable
+ public class FieldTable : Core.Tables.FieldTable
{
-
private IMessageSource _MessageSource;
/// <summary>
@@ -30,6 +29,6 @@
field.MessageSource = this.MessageSource;
return field;
}
-
+
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/AlertLabel.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/AlertLabel.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/AlertLabel.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/AlertLabel.cs Tue Nov 15 14:07:37 2005
@@ -6,13 +6,12 @@
/// </summary>
public class AlertLabel : ViewLabel
{
-
/// <summary>
/// Default suffix for NameLabel IDs ["_alert"].
/// </summary>
///
public const string ALERT_SUFFIX = "_alert";
-
+
/// <summary>
/// Set the defaults for this subclass.
/// </summary>
@@ -25,5 +24,4 @@
}
}
-}
-
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/Controls/LetterFilter.ascx.cs Tue Nov 15 14:07:37 2005
@@ -2,7 +2,6 @@
using System.Collections;
using System.Data;
using System.Web.UI.WebControls;
-using Nexus.Web;
using WQD.Core.Controls;
namespace Nexus.Web.Controls
@@ -17,7 +16,6 @@
///
public class LetterFilter : FindControl
{
-
/// <summary>
/// Document token representing match all entries.
/// </summary>
@@ -28,12 +26,11 @@
/// </summary>
public const string ITEM_INITIAL = "initial";
/// <summary>
-
/// Provide a key under which to store the selected letter in ViewState.
/// </summary>
///
public const string LETTER_KEY = "_Letter";
-
+
/// <summary>
/// Document the wildcard character used by SQL queries.
/// </summary>
@@ -151,7 +148,7 @@
if (ALL.Equals(letter)) letter = null;
string letter2 = letter + WILDCARD;
IDictionary criteria = new Hashtable(1);
- criteria.Add(ITEM_INITIAL,letter2);
+ criteria.Add(ITEM_INITIAL, letter2);
FindArgs a = new FindArgs(e, criteria);
View_Filter(source, a);
}
@@ -183,7 +180,7 @@
/// </summary>
/// <param name="input">List of letters to present as commands</param>
private void LetterTable_Init(IList input)
- {
+ {
DataTable dt = new DataTable();
dt.Columns.Add(new DataColumn(LETTER_COLUMN, typeof (string)));
@@ -193,7 +190,7 @@
dr[0] = input[i];
dt.Rows.Add(dr);
}
-
+
LetterTable = dt;
Letter = null;
}
@@ -210,10 +207,10 @@
{
// Default to A-Z
string[] input = {
- "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
- "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
- "U", "V", "W", "X", "Y", "Z", ALL
- };
+ "A", "B", "C", "D", "E", "F", "G", "H", "I", "J",
+ "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T",
+ "U", "V", "W", "X", "Y", "Z", ALL
+ };
LetterTable_Init(input);
}
@@ -233,7 +230,7 @@
public bool Open(IList letters)
{
LetterTable_Init(letters);
- return Open();
+ return Open();
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/FindControl.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/FindControl.ascx.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/FindControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/FindControl.ascx.cs Tue Nov 15 14:07:37 2005
@@ -1,12 +1,10 @@
using System;
using System.Collections;
using Nexus.Core.Helpers;
-using Nexus.Web;
using WQD.Core.Controls;
namespace Nexus.Web
{
-
/// <summary>
/// Base class for find controls.
/// </summary>
@@ -65,7 +63,7 @@
if (View_Find != null)
{
FindArgs a = new FindArgs(e, Criteria);
- View_Find(sender, a);
+ View_Find(sender, a);
}
}
@@ -80,7 +78,7 @@
/// </p></remarks>
///
public virtual bool Open()
- {
+ {
IViewHelper helper = ExecuteBind(FindCommand);
Bind(Profile.Criteria);
bool okay = helper.IsNominal;
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=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Tue Nov 15 14:07:37 2005
@@ -32,17 +32,17 @@
{
if (Grid.AllowCustomPaging)
{
- if (criteria==null) criteria = new Hashtable(); // FIXME: Spring?
+ if (criteria == null) criteria = new Hashtable(); // FIXME: Spring?
int page = pageIndex;
int limit = Grid.PageSize;
- int offset = page * limit;
+ int offset = page*limit;
criteria[ITEM_LIMIT] = limit;
criteria[ITEM_OFFSET] = offset;
}
list_Criteria = criteria;
return criteria;
}
-
+
/// <summary>
/// If AllowCustomPage is set,
/// calculate new List and Offset, using the list_Context.
@@ -56,7 +56,7 @@
protected IDictionary list_Criteria_NewPageIndex(int pageIndex)
{
IDictionary criteria = list_Criteria;
- return list_Criteria_NewPageIndex(criteria,pageIndex);
+ return list_Criteria_NewPageIndex(criteria, pageIndex);
}
/// <summary>
@@ -81,8 +81,8 @@
ICollection keys = criteria.Keys;
foreach (string key in keys)
{
- list_Criteria[key] = criteria[key];
- }
+ list_Criteria[key] = criteria[key];
+ }
}
/// <summary>
@@ -189,11 +189,12 @@
set { _DataKeyField = value; }
}
- private IList _Configs;
+ private IList _Configs;
+
public virtual IList Configs
{
- get {return _Configs;}
- set {_Configs = value;}
+ get { return _Configs; }
+ set { _Configs = value; }
}
#endregion
@@ -376,7 +377,7 @@
// Only bind columns once
// WARNING: Won't work with a singleton
DataGrid grid = Grid;
- int count = (helper.Outcome).Count;
+ int count = (helper.Outcome).Count;
if (bind)
{
bind = false;
@@ -391,10 +392,10 @@
}
BindColumns(i);
}
- ListPageIndexChanged_Raise(this,
- grid.CurrentPageIndex,
- grid.PageSize,
- count);
+ ListPageIndexChanged_Raise(this,
+ grid.CurrentPageIndex,
+ grid.PageSize,
+ count);
DataSource(helper);
DataBind();
}
@@ -508,9 +509,9 @@
protected virtual IViewHelper Save(string key, ControlCollection controls)
{
- return Save(key,controls,true);
+ return Save(key, controls, true);
}
-
+
#endregion
#region Loading methods
@@ -535,9 +536,9 @@
{
IViewHelper helper;
- if ((Grid.AllowCustomPaging) && (criteria==null))
+ if ((Grid.AllowCustomPaging) && (criteria == null))
{
- list_Criteria_NewPageIndex(criteria,0);
+ list_Criteria_NewPageIndex(criteria, 0);
HasCriteria = true;
}
@@ -578,7 +579,7 @@
public virtual bool Open(IDictionary criteria)
{
Page_Reset();
- list_Criteria_NewPageIndex(criteria,0);
+ list_Criteria_NewPageIndex(criteria, 0);
return Open();
}
@@ -719,7 +720,7 @@
protected void list_Add(object sender, EventArgs e)
{
list_Add_Load();
- if (View_Add!=null) View_Add(sender,e);
+ if (View_Add != null) View_Add(sender, e);
}
private void List_Item(object source, DataGridCommandEventArgs e)
@@ -741,7 +742,7 @@
/// and provide values for a page index hint.
/// </summary>
///
- public event EventHandler ListPageIndexChanged;
+ public event EventHandler ListPageIndexChanged;
/// <summary>
/// Provide a default key for message resources that set the hint label.
@@ -774,22 +775,21 @@
/// <returns>Formatted message string ready to markup and present</returns>
///
public string ListPageIndexChanged_Message(ListPageIndexChangedArgs args)
- {
-
+ {
string[] m_args = new string[3];
m_args[0] = Convert.ToString(args.ItemFrom);
m_args[1] = Convert.ToString(args.ItemThru);
m_args[2] = Convert.ToString(args.ItemCount);
-
+
string text;
- if (args.ItemCount==0)
+ if (args.ItemCount == 0)
{
text = GetMessage(NOT_FOUND_HINT);
}
else
{
- text = GetMessage(PAGE_INDEX_HINT,m_args);
- }
+ text = GetMessage(PAGE_INDEX_HINT, m_args);
+ }
return text;
}
@@ -803,17 +803,17 @@
///
private void ListPageIndexChanged_Raise(object sender, int page, int size, int count)
{
- if (ListPageIndexChanged!=null)
+ if (ListPageIndexChanged != null)
{
- int from = (page * size) + 1;
- int thru = (page * size) + size;
- if (thru>count) thru = count;
+ int from = (page*size) + 1;
+ int thru = (page*size) + size;
+ if (thru > count) thru = count;
ListPageIndexChangedArgs a = new ListPageIndexChangedArgs();
a.ItemFrom = from;
a.ItemThru = thru;
a.ItemCount = count;
ListPageIndexChanged(sender, a);
- }
+ }
}
/// <summary>
@@ -825,21 +825,21 @@
private void list_PageIndexChanged(object sender, DataGridPageChangedEventArgs e)
{
DataGrid grid = Grid;
- int count = (grid.DataSource as IList).Count;
+ int count = (grid.DataSource as IList).Count;
if (grid.AllowCustomPaging)
{
IDictionary criteria = list_Criteria_NewPageIndex(e.NewPageIndex);
IViewHelper helper = GetHelperFor(ListCommand);
- helper.Read(criteria,true);
+ helper.Read(criteria, true);
helper.Execute();
DataSource(helper);
- count = GetItemCount(helper) ;
+ count = GetItemCount(helper);
}
grid.CurrentPageIndex = e.NewPageIndex;
ListPageIndexChanged_Raise(sender, e.NewPageIndex, grid.PageSize, count);
- list_Refresh();
+ list_Refresh();
}
#endregion
@@ -852,10 +852,10 @@
protected void add_Click(object sender, EventArgs e)
{
- if (View_Add!=null)
+ if (View_Add != null)
{
- FindArgs f = new FindArgs(e,list_Criteria);
- View_Add(sender,f);
+ FindArgs f = new FindArgs(e, list_Criteria);
+ View_Add(sender, f);
}
}
@@ -926,11 +926,11 @@
public interface IGridConfig
{
- string DataField {get;}
- string HeaderText {get;}
- ITemplate ItemTemplate {get;set;}
- ITemplate EditItemTemplate {get;set;}
- bool HasTemplate {get;}
+ string DataField { get; }
+ string HeaderText { get; }
+ ITemplate ItemTemplate { get; set; }
+ ITemplate EditItemTemplate { get; set; }
+ bool HasTemplate { get; }
}
public class GridConfig : IGridConfig
@@ -940,6 +940,7 @@
/// </summary>
///
private string _DataField;
+
public string DataField
{
get { return _DataField; }
@@ -950,11 +951,12 @@
/// </summary>
///
private string _HeaderText;
+
public string HeaderText
{
- get
+ get
{
- if (_HeaderText==null) return DataField;
+ if (_HeaderText == null) return DataField;
return _HeaderText;
}
}
@@ -963,20 +965,22 @@
/// Item template for this attribute (optional).
/// </summary>
private ITemplate _ItemTemplate;
+
public ITemplate ItemTemplate
{
- get {return _ItemTemplate;}
- set {_ItemTemplate = value;}
+ get { return _ItemTemplate; }
+ set { _ItemTemplate = value; }
}
/// <summary>
/// Edit template for this attribute (optional).
/// </summary>
private ITemplate _EditItemTemplate;
+
public ITemplate EditItemTemplate
{
- get {return _EditItemTemplate;}
- set {_EditItemTemplate = value;}
+ get { return _EditItemTemplate; }
+ set { _EditItemTemplate = value; }
}
// string DataFormat;
@@ -985,9 +989,9 @@
public bool HasTemplate
{
- get {return (_ItemTemplate != null) || (_EditItemTemplate != null);}
+ get { return (_ItemTemplate != null) || (_EditItemTemplate != null); }
}
-
+
public GridConfig(string dataField, string headerText)
{
_DataField = dataField;
@@ -1006,7 +1010,6 @@
public class LiteralTemplate : ITemplate
{
-
private string _DataField;
private void OnDataBinding(object sender, EventArgs e)
@@ -1025,15 +1028,14 @@
container.Controls.Add(control);
}
- public LiteralTemplate (string dataField)
- {
- _DataField = dataField;
+ public LiteralTemplate(string dataField)
+ {
+ _DataField = dataField;
}
}
-
+
public class KeyValueTemplate : ITemplate
{
-
private string _DataField;
private IKeyValueList _Control;
@@ -1054,16 +1056,15 @@
container.Controls.Add(control);
}
- public KeyValueTemplate (string dataField, IKeyValueList list)
- {
- _DataField = dataField;
+ public KeyValueTemplate(string dataField, IKeyValueList list)
+ {
+ _DataField = dataField;
_Control = list;
}
}
public class DropDownListTemplate : ITemplate
{
-
private string _DataField;
private DropDownList _Control;
@@ -1083,7 +1084,7 @@
}
}
}
-
+
private void OnDataBinding(object sender, EventArgs e)
{
DropDownList control;
@@ -1097,7 +1098,7 @@
/// <summary>
/// Cache the selected index for OnPreRender.
/// </summary>
- private int _SelectedIndex;
+ private int _SelectedIndex;
/// <summary>
/// Kludge method to set Selected Index.
@@ -1144,11 +1145,10 @@
_Control.DataBind();
_Control.DataBinding += new EventHandler(OnDataBinding);
_Control.PreRender += new EventHandler(OnPreRender);
- }
+ }
}
-
+
#endregion
-
}
/*
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/HintLabel.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/HintLabel.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/HintLabel.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/HintLabel.cs Tue Nov 15 14:07:37 2005
@@ -6,12 +6,11 @@
/// </summary>
public class HintLabel : ViewLabel
{
-
/// <summary>
/// Default suffix for NameLabel IDs ["_hint"].
/// </summary>
public const string HINT_SUFFIX = "_hint";
-
+
/// <summary>
/// Set the defaults for this subclass.
/// </summary>
@@ -21,5 +20,4 @@
View_Alert = false;
}
}
-}
-
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/TextLabel.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/TextLabel.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/TextLabel.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/TextLabel.cs Tue Nov 15 14:07:37 2005
@@ -6,12 +6,11 @@
/// </summary>
public class TextLabel : ViewLabel
{
-
/// <summary>
/// Default suffix for NameLabel IDs ["_label"].
/// </summary>
public const string TEXT_SUFFIX = "_label";
-
+
/// <summary>
/// Set the defaults for this subclass.
/// </summary>
@@ -23,4 +22,4 @@
View_Alert = false;
}
}
-}
+}
\ No newline at end of file
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=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs Tue Nov 15 14:07:37 2005
@@ -243,12 +243,12 @@
/// <returns>Value of first paramter that has "id"
/// as any part of its name.</returns>
protected string FindControlValue(string id)
- {
+ {
string ctlKey = null;
string[] keys = Request.Params.AllKeys;
foreach (string key in keys)
{
- bool found = (key.IndexOf(id)>-1);
+ bool found = (key.IndexOf(id) > -1);
if (found) ctlKey = key;
continue;
}
@@ -305,12 +305,12 @@
/// <param name="key">A key value from the list</param>
/// <returns>-1 if not found</returns>
///
- protected int IndexForKey (IList list, string key)
+ protected int IndexForKey(IList list, string key)
{
int i = 0;
foreach (KeyValue row in list)
{
- if (key.Equals (row.Key))
+ if (key.Equals(row.Key))
return i;
i++;
}
@@ -348,7 +348,7 @@
}
}
- private IProfile _Profile;
+ private IProfile _Profile;
public IProfile Profile
{
@@ -388,8 +388,8 @@
}
*/
continue;
- }
- }
+ }
+ }
}
private void BindControls(ControlCollection controls, IDictionary dictionary, string prefix, string list_suffix)
@@ -630,11 +630,11 @@
ViewLabel x = (ViewLabel) t;
if (x.Resource) try
{
- x.Text = GetMessage(x.ID);
+ x.Text = GetMessage(x.ID);
}
catch (Exception e)
{
- if (x.Required) throw(e);
+ if (x.Required) throw(e);
}
continue;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/ViewLabel.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/ViewLabel.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewLabel.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewLabel.cs Tue Nov 15 14:07:37 2005
@@ -4,14 +4,12 @@
namespace Nexus.Web
{
-
/// <summary>
/// Present dynamic message by consulting with Message Resources
/// or handling an event.
/// </summary>
public class ViewLabel : Label
{
-
/// <summary>
/// Field for EntryID property.
/// </summary>
@@ -30,14 +28,14 @@
{
get
{
- if ((_EntryID==null) || (_EntryID.Length==0))
+ if ((_EntryID == null) || (_EntryID.Length == 0))
{
int v = ID.LastIndexOf(Suffix);
_EntryID = ID.Substring(0, v);
}
return _EntryID;
}
- set { _EntryID = value;}
+ set { _EntryID = value; }
}
public const string MESSAGE_SUFFIX = "_msg";
@@ -55,7 +53,7 @@
public string Suffix
{
get { return _Suffix; }
- set { _Suffix = value;}
+ set { _Suffix = value; }
}
/// <summary>
@@ -71,9 +69,9 @@
public bool Resource
{
get { return _Resource; }
- set { _Resource = value;}
+ set { _Resource = value; }
}
-
+
/// <summary>
/// Field for Required property [FALSE].
/// </summary>
@@ -88,7 +86,7 @@
public bool Required
{
get { return _Required; }
- set { _Required = value;}
+ set { _Required = value; }
}
/// <summary>
@@ -105,7 +103,7 @@
public bool View_Hint
{
get { return _View_Hint; }
- set { _View_Hint = value;}
+ set { _View_Hint = value; }
}
/// <summary>
@@ -122,7 +120,7 @@
public bool View_Alert
{
get { return _View_Alert; }
- set { _View_Alert = value;}
+ set { _View_Alert = value; }
}
/// <summary>
@@ -154,5 +152,5 @@
if (helper != null) Alerts = helper;
else throw new ArgumentException("ViewLabel.View_Alert_Handler: (e.helper==null)");
}
- }
-}
+ }
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs?rev=344453&r1=344452&r2=344453&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs Tue Nov 15 14:07:37 2005
@@ -8,30 +8,29 @@
{
public override string AlertsFor(string id)
{
- string alert = null;
+ string alert = null;
IList list = Alerts[id] as IList;
- if (list==null) return alert;
+ if (list == null) return alert;
- if (list.Count==1)
+ if (list.Count == 1)
{
alert = HtmlMessage(list[0]);
}
else
{
alert = HtmlMessageList(list);
- }
+ }
return alert;
}
public override string AlertsText
{
- get
- { return HtmlMessageBuilder(Alerts); }
+ get { return HtmlMessageBuilder(Alerts); }
}
public override string HintsFor(string id)
{
- return HtmlMessageList(Hints[id] as IList);
+ return HtmlMessageList(Hints[id] as IList);
}
public override string HintsText
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org