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/09/01 21:27:30 UTC
svn commit: r265772 [1/3] - in /struts/sandbox/trunk/overdrive/Nexus: ./
Core/ Core/Helpers/ Core/Profile/ Core/Tables/ Core/Validators/ Extras/
Extras/Spring/ Test/ Test/Commands/ Web/
Author: husted
Date: Thu Sep 1 12:26:36 2005
New Revision: 265772
URL: http://svn.apache.org/viewcvs?rev=265772&view=rev
Log:
* Remove and add Web project to get it to open on my local machine.
* Reformat code with Resharper.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IEntryList.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/KeyValue.cs
struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserIdentity.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserPrincipal.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs
struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs
struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Tables/IFieldTable.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ClearContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/CollectionProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ConvertInput.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/EntryListProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/KeyValueProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Processor.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/StringProcessor.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Objects.cs
struts/sandbox/trunk/overdrive/Nexus/Nexus.sln
struts/sandbox/trunk/overdrive/Nexus/Test/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs
struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ListAll.cs
struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs
struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs
struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs
struts/sandbox/trunk/overdrive/Nexus/Test/RequestCommandTest.cs
struts/sandbox/trunk/overdrive/Nexus/Test/RequestContextTest.cs
struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj
struts/sandbox/trunk/overdrive/Nexus/Web/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx
struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/Global.asax.cs
struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Web/IGridViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Web/NexusDataGrid.cs
struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj
struts/sandbox/trunk/overdrive/Nexus/Web/WebViewHelper.cs
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/AssemblyInfo.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/AssemblyInfo.cs Thu Sep 1 12:26:36 2005
@@ -4,14 +4,14 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
-[assembly : AssemblyTitle ("")]
-[assembly : AssemblyDescription ("")]
-[assembly : AssemblyConfiguration ("")]
-[assembly : AssemblyCompany ("")]
-[assembly : AssemblyProduct ("")]
-[assembly : AssemblyCopyright ("")]
-[assembly : AssemblyTrademark ("")]
-[assembly : AssemblyCulture ("")]
+[assembly : AssemblyTitle("")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("")]
+[assembly : AssemblyProduct("")]
+[assembly : AssemblyCopyright("")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
@@ -24,7 +24,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly : AssemblyVersion ("1.0.*")]
+[assembly : AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@@ -51,6 +51,6 @@
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
-[assembly : AssemblyDelaySign (false)]
-[assembly : AssemblyKeyFile ("")]
-[assembly : AssemblyKeyName ("")]
\ No newline at end of file
+[assembly : AssemblyDelaySign(false)]
+[assembly : AssemblyKeyFile("")]
+[assembly : AssemblyKeyName("")]
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs Thu Sep 1 12:26:36 2005
@@ -44,7 +44,7 @@
/// </p></remarks>
/// <param name="controls">Collection of controls to populate.</param>
///
- void ExecuteBind (ICollection controls);
+ void ExecuteBind(ICollection controls);
/// <summary>
@@ -59,7 +59,7 @@
/// from a panel control.
/// </p></remarks>
///
- void ReadExecute (ICollection controls);
+ void ReadExecute(ICollection controls);
/// <summary>
@@ -69,14 +69,14 @@
/// <param name="controls">Collection of controls to
/// populate.</param>
///
- void Bind (ICollection controls);
+ void Bind(ICollection controls);
/// <summary>
/// Invoke the helper's command.
/// </summary>
///
- void Execute ();
+ void Execute();
/// <summary>
@@ -84,7 +84,7 @@
/// </summary>
/// <param name="controls">Collection of controls to populate.</param>
///
- void Read (ICollection controls);
+ void Read(ICollection controls);
/// <summary>
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs Thu Sep 1 12:26:36 2005
@@ -48,17 +48,17 @@
#region Read and Bind (abstract)
- public abstract void ExecuteBind (ICollection controls);
+ public abstract void ExecuteBind(ICollection controls);
- public abstract void ReadExecute (ICollection controls);
+ public abstract void ReadExecute(ICollection controls);
- public abstract void Bind (ICollection controls);
+ public abstract void Bind(ICollection controls);
- public abstract void Read (ICollection controls);
+ public abstract void Read(ICollection controls);
- public void Execute ()
+ public void Execute()
{
- Catalog.ExecuteView (Context);
+ Catalog.ExecuteView(Context);
}
#endregion
@@ -75,10 +75,7 @@
public IDictionary Criteria
{
- get
- {
- return Context.Criteria;
- }
+ get { return Context.Criteria; }
}
public virtual IList Outcome
@@ -89,16 +86,16 @@
object o = Criteria[Context.Command];
if (o == null)
{
- result = new ArrayList (1);
- result.Add (Criteria);
+ result = new ArrayList(1);
+ result.Add(Criteria);
}
else
{
result = o as IList;
if (result == null)
{
- result = new ArrayList (1);
- result.Add (o);
+ result = new ArrayList(1);
+ result.Add(o);
}
}
return result;
@@ -155,6 +152,7 @@
}
private IList _FieldSet;
+
public virtual IList FieldSet
{
get { return _FieldSet; }
@@ -166,6 +164,7 @@
#region Options
private string _Prefix = PREFIX;
+
public string Prefix
{
get { return _Prefix; }
@@ -173,6 +172,7 @@
}
private string _ListSuffix = LIST_SUFFIX;
+
public string ListSuffix
{
get { return _ListSuffix; }
@@ -180,6 +180,7 @@
}
private bool _NullIfEmpty = NULL_IF_EMPTY;
+
public bool NullIfEmpty
{
get { return _NullIfEmpty; }
@@ -187,6 +188,7 @@
}
private string _SelectItemPrompt = SELECT_ITEM_PROMPT;
+
public string SelectItemPrompt
{
get { return _SelectItemPrompt; }
@@ -198,6 +200,7 @@
#region Properties
private IRequestCatalog _Catalog;
+
/// <summary>
/// Provide the application object catalog for this Helper.
/// </summary>
@@ -213,6 +216,7 @@
}
private IRequestCommand _Command;
+
/// <summary>
/// Provide the command for this Helper.
/// </summary>
@@ -228,6 +232,7 @@
}
private IRequestContext _Context;
+
/// <summary>
/// Provide the all-important Context for this Helper.
/// </summary>
@@ -244,8 +249,8 @@
if (_Context == null)
{
IRequestCommand rc = Command;
- if (rc==null) throw new ArgumentNullException("Command==null","ViewHelper.Context");
- _Context = Catalog.GetRequest (rc);
+ if (rc == null) throw new ArgumentNullException("Command==null", "ViewHelper.Context");
+ _Context = Catalog.GetRequest(rc);
}
return _Context;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IEntryList.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IEntryList.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IEntryList.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IEntryList.cs Thu Sep 1 12:26:36 2005
@@ -10,7 +10,7 @@
/// <summary>
/// Create and Insert a new entry object at index 0.
/// </summary>
- object Insert (string key);
+ object Insert(string key);
/// <summary>
/// Add a entry object based on an IDictionary.
@@ -19,4 +19,4 @@
void AddEntry(IDictionary row);
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs Thu Sep 1 12:26:36 2005
@@ -27,7 +27,6 @@
///
public interface IRequestCatalog : ICatalog
{
-
/// <summary>
/// Provide the FieldTable for this Catalog.
/// </summary>
@@ -36,8 +35,8 @@
/// with a reference to the FieldTable,
/// among other things.
/// </p></remarks>
- IFieldTable FieldTable {get;set;}
-
+ IFieldTable FieldTable { get; set; }
+
/// <summary>
/// Execute before a Command called via ExecuteView.
/// </summary>
@@ -45,8 +44,8 @@
/// Of course, a IRequestChain may be used here too.
/// </p></remarks>
///
- IRequestCommand PreOp {get;set;}
-
+ IRequestCommand PreOp { get; set; }
+
/// <summary>
/// Execute after a Command called via ExecuteView.
/// </summary>
@@ -54,7 +53,7 @@
/// Of course, a IRequestChain may be used here too.
/// </p></remarks>
///
- IRequestCommand PostOp {get;set;}
+ IRequestCommand PostOp { get; set; }
/// <summary>
@@ -62,14 +61,14 @@
/// </summary>
/// <param name="name">Our object ID</param>
/// <returns>object for name</returns>
- object GetObject (string name);
+ object GetObject(string name);
/// <summary>
/// Obtains a IViewHelper for helper ID.
/// </summary>
/// <param name="name">Our helper ID</param>
/// <returns>IViewHelper for name</returns>
- IViewHelper GetHelper (string name);
+ IViewHelper GetHelper(string name);
/// <summary>
/// Obtain a IRequestContext for command ID,
@@ -78,7 +77,7 @@
/// <param name="name">Our command ID</param>
/// <returns>IRequestContext with embedded resources.</returns>
///
- IRequestContext GetRequest (string name);
+ IRequestContext GetRequest(string name);
/// <summary>
/// Obtain a IRequestContext for command ID,
@@ -89,7 +88,7 @@
/// <param name="input">Our input values</param>
/// <returns>IRequestContext with embedded resources.</returns>
///
- IRequestContext GetRequest (string name, IDictionary input);
+ IRequestContext GetRequest(string name, IDictionary input);
/// <summary>
/// Obtain a IRequestContext for the command,
@@ -98,7 +97,7 @@
/// <param name="command">Our command</param>
/// <returns>IRequestContext with embedded resources.</returns>
///
- IRequestContext GetRequest (IRequestCommand command);
+ IRequestContext GetRequest(IRequestCommand command);
/// <summary>
/// Obtain and execute a IRequestContext.
@@ -106,14 +105,14 @@
/// <param name="name">Our command ID</param>
/// <returns>Context after execution</returns>
///
- IRequestContext ExecuteRequest (string name);
+ IRequestContext ExecuteRequest(string name);
/// <summary>
/// Execute a IRequestContext.
/// </summary>
/// <param name="context">Context to execute</param>
///
- void ExecuteRequest (IRequestContext context);
+ void ExecuteRequest(IRequestContext context);
/// <summary>
/// Execute a IRequestContext as part of a chain
@@ -132,7 +131,7 @@
/// </p></remarks>
/// <param name="context">Context to execute</param>
///
- void ExecuteView (IRequestContext context);
+ void ExecuteView(IRequestContext context);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCommand.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCommand.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCommand.cs Thu Sep 1 12:26:36 2005
@@ -55,7 +55,7 @@
/// </summary>
/// <returns>Context instance with Command ID set.</returns>
///
- IRequestContext NewContext ();
+ IRequestContext NewContext();
/// <summary>
/// Field IDs required by this Command.
@@ -140,7 +140,7 @@
/// </p></remarks>
/// <param name="context">Context to process.</param>
///
- bool RequestExecute (IRequestContext context);
+ bool RequestExecute(IRequestContext context);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs Thu Sep 1 12:26:36 2005
@@ -131,7 +131,7 @@
/// Indicate whether a Criteria is present.
/// </summary>
/// <returns>True if a Criteria is present.</returns>
- bool HasCriteria ();
+ bool HasCriteria();
/// <summary>
/// Provide an optional subcontext containing input or output
@@ -173,7 +173,7 @@
#region Messaging
- string FormatTemplate (string template, string value);
+ string FormatTemplate(string template, string value);
/// <summary>
/// Record a list of alert (or error) messages,
@@ -191,7 +191,7 @@
/// </summary>
/// <param name="template">Message template.</param>
///
- void AddAlert (string template);
+ void AddAlert(string template);
/// <summary>
/// Add an alert message, creating the context if needed.
@@ -201,21 +201,21 @@
/// </remarks>
/// <param name="template">Message template.</param>
/// <param name="message">Message key.</param>
- void AddAlert (string template, string message);
+ void AddAlert(string template, string message);
/// <summary>
/// Add a formatted "Alert" error message
/// for the given field key via the FieldTable.
/// </summary>
/// <param name="key">Key from the FieldTable</param>
- void AddAlertForField (string key);
+ void AddAlertForField(string key);
/// <summary>
/// Add a formatted "Required" error message
/// for the given field key via the FieldTable.
/// </summary>
/// <param name="key">Key from the FieldTable</param>
- void AddAlertRequired (string key);
+ void AddAlertRequired(string key);
/// <summary>
/// Indicate whether alerts exist.
@@ -262,14 +262,14 @@
/// <param name="template">Message template.</param>
/// <param name="message">Message key.</param>
///
- void AddHint (string template, string message);
+ void AddHint(string template, string message);
/// <summary>
/// Add a hint under the "global" key.
/// </summary>
/// <param name="template">Message template.</param>
///
- void AddHint (string template);
+ void AddHint(string template);
/// <summary>
/// Indicate whether hints exist.
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/KeyValue.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/KeyValue.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/KeyValue.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/KeyValue.cs Thu Sep 1 12:26:36 2005
@@ -23,12 +23,12 @@
[Serializable]
public class KeyValue : IKeyValue
{
- public KeyValue ()
+ public KeyValue()
{
;
}
- public KeyValue (string aKey, object aValue)
+ public KeyValue(string aKey, object aValue)
{
_Key = aKey;
_Value = aValue;
@@ -56,7 +56,7 @@
set { _Value = Text; }
}
- public override string ToString ()
+ public override string ToString()
{
return Text;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/KeyValueList.cs Thu Sep 1 12:26:36 2005
@@ -10,7 +10,7 @@
/// <summary>
/// Construct instance without parameters.
/// </summary>
- public KeyValueList ()
+ public KeyValueList()
{
}
@@ -23,7 +23,7 @@
{
foreach (object o in value)
{
- this.Add (o);
+ this.Add(o);
}
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserIdentity.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserIdentity.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserIdentity.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserIdentity.cs Thu Sep 1 12:26:36 2005
@@ -19,12 +19,14 @@
public class UserIdentity : IIdentity
{
private string _Name;
+
public string Name
{
get { return _Name; }
}
private string _AuthenticationType;
+
public string AuthenticationType
{
get { return _AuthenticationType; }
@@ -32,6 +34,7 @@
}
private bool _IsAuthenticated = false;
+
public bool IsAuthenticated
{
get { return _IsAuthenticated; }
@@ -41,7 +44,7 @@
/// <summary>
/// Instantiate with zero parameters.
/// </summary>
- public UserIdentity ()
+ public UserIdentity()
{
}
@@ -52,7 +55,7 @@
/// Essentially, create a shallow copy of the given Identity.
/// </remarks>
/// <param name="id">Identity to copy</param>
- public UserIdentity (IIdentity id)
+ public UserIdentity(IIdentity id)
{
if (null != id)
{
@@ -68,7 +71,7 @@
/// <param name="name">Value for user's name</param>
/// <param name="authenticationType">Value for AuthenticationType</param>
/// <param name="isAuthenticated">Value for IsAuthenticated</param>
- public UserIdentity (string name, string authenticationType, bool isAuthenticated)
+ public UserIdentity(string name, string authenticationType, bool isAuthenticated)
{
_Name = name;
_AuthenticationType = authenticationType;
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserPrincipal.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserPrincipal.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserPrincipal.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserPrincipal.cs Thu Sep 1 12:26:36 2005
@@ -15,19 +15,20 @@
public class UserPrincipal : IPrincipal
{
private IIdentity _Identity;
+
public IIdentity Identity
{
get { return _Identity; }
set { _Identity = value; }
}
- public bool IsInRole (string role)
+ public bool IsInRole(string role)
{
if ((null == _Roles) || (0 == _Roles.Length)) return false;
if ((null == role) || (0 == role.Length)) return false;
bool found = false;
for (int i = 0; i < _Roles.Length; i++)
- found = found || role.Equals (_Roles [i]);
+ found = found || role.Equals(_Roles[i]);
return found;
}
@@ -48,9 +49,9 @@
/// <summary>
/// Instantiate default NexusPrincipal with empty NexusIdentity.
/// </summary>
- public UserPrincipal ()
+ public UserPrincipal()
{
- Identity = new UserIdentity (); // FIXME: Spring?
+ Identity = new UserIdentity(); // FIXME: Spring?
}
/// <summary>
@@ -62,9 +63,9 @@
/// Identity or Authentication Type.
/// </remarks>
/// <param name="id">Value for user name</param>
- public UserPrincipal (IIdentity id)
+ public UserPrincipal(IIdentity id)
{
- Identity = new UserIdentity (id); // FIXME: Spring?
+ Identity = new UserIdentity(id); // FIXME: Spring?
}
}
}
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=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Profile/UserProfile.cs Thu Sep 1 12:26:36 2005
@@ -28,6 +28,7 @@
public const string USER_ID = "USER_ID";
private IPrincipal _Principal;
+
/// <summary>
/// Provide the Principal object for this user.
/// </summary>
@@ -53,15 +54,16 @@
/// </summary>
/// <param name="name">A Identity Name that may contain a machine name reference</param>
/// <returns>Identity name with machine name removed</returns>
- protected string TrimMachineName (string name)
+ protected string TrimMachineName(string name)
{
if (null == name) return String.Empty;
- string[] logon = name.Split (USER_ID_SEPARATOR);
- if (logon.Length > 1) return logon [1];
- return logon [0];
+ string[] logon = name.Split(USER_ID_SEPARATOR);
+ if (logon.Length > 1) return logon[1];
+ return logon[0];
}
private string _UserId;
+
/// <summary>
/// Record the user id portion of the Identity Name.
/// </summary>
@@ -73,7 +75,7 @@
get
{
if (null == _UserId)
- _UserId = TrimMachineName (Principal.Identity.Name);
+ _UserId = TrimMachineName(Principal.Identity.Name);
return (null == _UserId) ? String.Empty : _UserId;
}
set { _UserId = value; }
@@ -84,6 +86,7 @@
#region UserLocale
private CultureInfo _UserLocale;
+
public CultureInfo UserLocale
{
get { return _UserLocale; }
@@ -97,16 +100,16 @@
/// <summary>
/// Instantiate a default profile.
/// </summary>
- public UserProfile ()
+ public UserProfile()
{
- Principal = new UserPrincipal (); // FIXME: Spring?
+ Principal = new UserPrincipal(); // FIXME: Spring?
}
/// <summary>
/// Instantiate from an IPrincipal.
/// </summary>
/// <param name="principal">Principal for this profile.</param>
- public UserProfile (IPrincipal principal)
+ public UserProfile(IPrincipal principal)
{
Principal = principal;
}
@@ -115,9 +118,9 @@
/// Instantiate from an IIdentity.
/// </summary>
/// <param name="id">Identity to copy for this profile.</param>
- public UserProfile (IIdentity id)
+ public UserProfile(IIdentity id)
{
- Principal = new UserPrincipal (id);
+ Principal = new UserPrincipal(id);
}
#endregion
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs Thu Sep 1 12:26:36 2005
@@ -9,15 +9,15 @@
/// </summary>
public class RequestChain : RequestCommand, IRequestChain
{
- private Chain chain = new Chain ();
+ private Chain chain = new Chain();
- public void AddCommand (ICommand _command)
+ public void AddCommand(ICommand _command)
{
IRequestCommand command = _command as IRequestCommand;
if (null == command)
- throw new ArgumentNullException ("RequestChain.AddCommand", "_command");
+ throw new ArgumentNullException("RequestChain.AddCommand", "_command");
- chain.AddCommand (command);
+ chain.AddCommand(command);
// Composite Required and Related
IList _RequiredIDs = command.RequiredIDs;
@@ -33,25 +33,25 @@
{
foreach (ICommand command in value)
{
- AddCommand (command);
+ AddCommand(command);
}
}
}
- public override bool Execute (IContext context)
+ public override bool Execute(IContext context)
{
- return chain.Execute (context);
+ return chain.Execute(context);
}
- public ICommand[] GetCommands ()
+ public ICommand[] GetCommands()
{
- return (chain.GetCommands ());
+ return (chain.GetCommands());
}
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- return Execute (context);
+ return Execute(context);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestCommand.cs Thu Sep 1 12:26:36 2005
@@ -39,6 +39,7 @@
public const bool CONTINUE = false;
private string _ID = null;
+
public virtual string ID
{
get { return _ID; }
@@ -46,6 +47,7 @@
}
private string _QueryID = null;
+
public virtual string QueryID
{
get
@@ -56,14 +58,15 @@
set { _QueryID = value; }
}
- public virtual IRequestContext NewContext ()
+ public virtual IRequestContext NewContext()
{
// Return a new instance on each call.
// ISSUE: Spring?
- return new RequestContext (ID);
+ return new RequestContext(ID);
}
private IList _RequiredIDs = null;
+
public virtual IList RequiredIDs
{
get { return _RequiredIDs; }
@@ -75,24 +78,25 @@
set
{
if (value == null)
- throw new ArgumentNullException ("BaseNexusCommand.AddRequiredIDs", "value");
+ throw new ArgumentNullException("BaseNexusCommand.AddRequiredIDs", "value");
IList list = RequiredIDs;
if (null == list)
RequiredIDs = value;
else
{
- IEnumerator elements = value.GetEnumerator ();
- while (elements.MoveNext ())
+ IEnumerator elements = value.GetEnumerator();
+ while (elements.MoveNext())
{
string i = elements.Current as string;
- bool need = (list.IndexOf (i) < 0);
- if (need) list.Add (i);
+ bool need = (list.IndexOf(i) < 0);
+ if (need) list.Add(i);
}
}
}
}
private IList _RelatedIDs = null;
+
public virtual IList RelatedIDs
{
get { return _RelatedIDs; }
@@ -104,24 +108,25 @@
set
{
if (value == null)
- throw new ArgumentNullException ("BaseNexusCommand.AddRelatedIDs", "value");
+ throw new ArgumentNullException("BaseNexusCommand.AddRelatedIDs", "value");
IList list = RelatedIDs;
if (null == list)
RelatedIDs = value;
else
{
- IEnumerator elements = value.GetEnumerator ();
- while (elements.MoveNext ())
+ IEnumerator elements = value.GetEnumerator();
+ while (elements.MoveNext())
{
string i = elements.Current as string;
- bool need = (list.IndexOf (i) < 0);
- if (need) list.Add (i);
+ bool need = (list.IndexOf(i) < 0);
+ if (need) list.Add(i);
}
}
}
}
private IList _RuntimeIDs = null;
+
public virtual IList RuntimeIDs
{
get { return _RuntimeIDs; }
@@ -133,29 +138,29 @@
set
{
if (value == null)
- throw new ArgumentNullException ("BaseNexusCommand.AddRuntimeIDs", "value");
+ throw new ArgumentNullException("BaseNexusCommand.AddRuntimeIDs", "value");
IList list = RuntimeIDs;
if (null == list)
RuntimeIDs = value;
else
{
- IEnumerator elements = value.GetEnumerator ();
- while (elements.MoveNext ())
+ IEnumerator elements = value.GetEnumerator();
+ while (elements.MoveNext())
{
string i = elements.Current as string;
- bool need = (list.IndexOf (i) < 0);
- if (need) list.Add (i);
+ bool need = (list.IndexOf(i) < 0);
+ if (need) list.Add(i);
}
}
}
}
- public abstract bool RequestExecute (IRequestContext context);
+ public abstract bool RequestExecute(IRequestContext context);
- public virtual bool Execute (IContext _context)
+ public virtual bool Execute(IContext _context)
{
IRequestContext context = _context as IRequestContext;
- return RequestExecute (context);
+ return RequestExecute(context);
}
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs Thu Sep 1 12:26:36 2005
@@ -32,18 +32,18 @@
/// Express state as a key=value list.
/// </summary>
/// <returns>Formatted string representing state.</returns>
- public override string ToString ()
+ public override string ToString()
{
- StringBuilder sb = new StringBuilder ();
+ StringBuilder sb = new StringBuilder();
foreach (DictionaryEntry e in this)
{
- sb.Append ("[");
- sb.Append (e.Key);
- sb.Append ("=");
- sb.Append (e.Value.ToString ());
- sb.Append ("], ");
+ sb.Append("[");
+ sb.Append(e.Key);
+ sb.Append("=");
+ sb.Append(e.Value.ToString());
+ sb.Append("], ");
}
- return sb.ToString ();
+ return sb.ToString();
}
/// <summary>
@@ -51,7 +51,7 @@
/// </summary>
/// <param name="command">Name of Command processing this Context.</param>
///
- public RequestContext (string command)
+ public RequestContext(string command)
{
Command = command;
}
@@ -60,7 +60,7 @@
{
foreach (DictionaryEntry entry in entries)
{
- Add(entry.Key,entry.Value);
+ Add(entry.Key, entry.Value);
}
}
@@ -68,74 +68,74 @@
/// Default, no argument constructor.
/// </summary>
///
- public RequestContext ()
+ public RequestContext()
{
}
public string Command
{
- get { return this [Tokens.Command] as string; }
- set { this [Tokens.Command] = value; }
+ get { return this[Tokens.Command] as string; }
+ set { this[Tokens.Command] = value; }
}
public IRequestCommand CommandBin
{
- get { return this [Tokens.CommandBin] as IRequestCommand; }
- set { this [Tokens.CommandBin] = value; }
+ get { return this[Tokens.CommandBin] as IRequestCommand; }
+ set { this[Tokens.CommandBin] = value; }
}
public IFieldTable FieldTable
{
- get { return this [Tokens.FieldTable] as IFieldTable; }
- set { this [Tokens.FieldTable] = value; }
+ get { return this[Tokens.FieldTable] as IFieldTable; }
+ set { this[Tokens.FieldTable] = value; }
}
public IProfile Profile
{
- get { return this [UserProfile.USER_PROFILE] as IProfile; }
+ get { return this[UserProfile.USER_PROFILE] as IProfile; }
set
{
- this [UserProfile.USER_PROFILE] = value;
+ this[UserProfile.USER_PROFILE] = value;
IProfile profile = value as IProfile;
if (null != profile)
- this [UserProfile.USER_ID] = profile.UserId;
+ this[UserProfile.USER_ID] = profile.UserId;
}
}
public bool HasOutcome
{
- get { return Contains (Command); }
+ get { return Contains(Command); }
}
public object Outcome
{
- get { return this [Command]; }
- set { this [Command] = value; }
+ get { return this[Command]; }
+ set { this[Command] = value; }
}
/// <summary>
/// Instantiate Criteria, if needed.
/// </summary>
- private void LazyCriteria ()
+ private void LazyCriteria()
{
// Naive, but we expect a Context instance to be single-threaded.
- if (this [Tokens.Criteria] == null)
- this [Tokens.Criteria] = new Hashtable (); // TODO: Spring?
+ if (this[Tokens.Criteria] == null)
+ this[Tokens.Criteria] = new Hashtable(); // TODO: Spring?
}
public IDictionary Criteria
{
get
{
- LazyCriteria ();
- return this [Tokens.Criteria] as IDictionary;
+ LazyCriteria();
+ return this[Tokens.Criteria] as IDictionary;
}
- set { this [Tokens.Criteria] = value; }
+ set { this[Tokens.Criteria] = value; }
}
- public bool HasCriteria ()
+ public bool HasCriteria()
{
- return ContainsKey (Tokens.Criteria);
+ return ContainsKey(Tokens.Criteria);
}
@@ -147,79 +147,79 @@
/// store.</param>
/// <param name="key">Token for message store.</param>
///
- private void AddStore (string template, string queue, string key)
+ private void AddStore(string template, string queue, string key)
{
- IDictionary store = this [key] as IDictionary;
+ IDictionary store = this[key] as IDictionary;
if (null == store)
{
- store = new Hashtable (); // ISSUE: Spring?
- this [key] = store;
+ store = new Hashtable(); // ISSUE: Spring?
+ this[key] = store;
}
IList list;
- if (store.Contains (queue))
- list = store [queue] as IList;
+ if (store.Contains(queue))
+ list = store[queue] as IList;
else
{
- list = new ArrayList (); // ISSUE: Spring?
- store [queue] = list;
+ list = new ArrayList(); // ISSUE: Spring?
+ store[queue] = list;
}
- list.Add (template);
+ list.Add(template);
}
- public string FormatTemplate (string template, string value)
+ public string FormatTemplate(string template, string value)
{
- StringBuilder sb = new StringBuilder ();
- sb.AppendFormat (template, value);
- return sb.ToString ();
+ StringBuilder sb = new StringBuilder();
+ sb.AppendFormat(template, value);
+ return sb.ToString();
}
public IDictionary Alerts
{
- get { return this [Tokens.Alerts] as IDictionary; }
- set { this [Tokens.Alerts] = value; }
+ get { return this[Tokens.Alerts] as IDictionary; }
+ set { this[Tokens.Alerts] = value; }
}
- public void AddAlert (string template)
+ public void AddAlert(string template)
{
- AddStore (template, Tokens.GenericMessage, Tokens.Alerts);
+ AddStore(template, Tokens.GenericMessage, Tokens.Alerts);
}
- public void AddAlert (string template, string queue)
+ public void AddAlert(string template, string queue)
{
- AddStore (template, queue, Tokens.Alerts);
+ AddStore(template, queue, Tokens.Alerts);
}
- public void AddAlertForField (string key)
+ public void AddAlertForField(string key)
{
- string message = FormatTemplate (FieldTable.Alert (key), FieldTable.Label(key));
- AddAlert (message, key);
+ string message = FormatTemplate(FieldTable.Alert(key), FieldTable.Label(key));
+ AddAlert(message, key);
}
- public void AddAlertRequired (string key)
+ public void AddAlertRequired(string key)
{
- string message = FormatTemplate (FieldTable.Required (key), FieldTable.Label(key));
- AddAlert (message, key);
+ string message = FormatTemplate(FieldTable.Required(key), FieldTable.Label(key));
+ AddAlert(message, key);
}
public bool HasAlerts
{
- get { return this.ContainsKey (Tokens.Alerts); }
+ get { return this.ContainsKey(Tokens.Alerts); }
}
public Exception Fault
{
- get { return this [Tokens.Fault] as Exception; }
+ get { return this[Tokens.Fault] as Exception; }
set
{
Exception e = value as Exception;
- this [Tokens.Fault] = e;
- AddAlert (e.Message);
+ this[Tokens.Fault] = e;
+ AddAlert(e.Message);
}
}
public bool HasFault
{
- get { return this.ContainsKey (Tokens.Fault); }
+ get { return this.ContainsKey(Tokens.Fault); }
}
public bool IsNominal
@@ -229,23 +229,23 @@
public IDictionary Hints
{
- get { return this [Tokens.Hints] as IDictionary; }
- set { this [Tokens.Hints] = value; }
+ get { return this[Tokens.Hints] as IDictionary; }
+ set { this[Tokens.Hints] = value; }
}
- public void AddHint (string template)
+ public void AddHint(string template)
{
- AddStore (template, Tokens.GenericMessage, Tokens.Hints);
+ AddStore(template, Tokens.GenericMessage, Tokens.Hints);
}
- public void AddHint (string template, string queue)
+ public void AddHint(string template, string queue)
{
- AddStore (template, queue, Tokens.Hints);
+ AddStore(template, queue, Tokens.Hints);
}
public bool HasHints
{
- get { return this.ContainsKey (Tokens.Hints); }
+ get { return this.ContainsKey(Tokens.Hints); }
}
}
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=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs Thu Sep 1 12:26:36 2005
@@ -10,7 +10,7 @@
[Serializable]
public class FieldContext : Context, IFieldContext
{
- public FieldContext () : base ()
+ public FieldContext() : base()
{
ControlTypeName = Tokens.CONTROL_INPUT; // Default
}
@@ -21,59 +21,59 @@
{
string alert = null;
IProcessor processor = Processor;
- if (processor!=null) alert = processor.Alert;
- if (alert==null) alert = this[Tokens.Alert] as string;
- if (alert==null) alert = this[Tokens.Alert] as string;
+ if (processor != null) alert = processor.Alert;
+ if (alert == null) alert = this[Tokens.Alert] as string;
+ if (alert == null) alert = this[Tokens.Alert] as string;
return alert;
}
- set { this [Tokens.Alert] = value; }
+ set { this[Tokens.Alert] = value; }
}
public string ControlTypeName
{
- get { return this [Tokens.ControlTypeName] as string; }
- set { this [Tokens.ControlTypeName] = value; }
+ get { return this[Tokens.ControlTypeName] as string; }
+ set { this[Tokens.ControlTypeName] = value; }
}
public string Hint
{
- get { return this [Tokens.Hint] as string; }
- set { this [Tokens.Hint] = value; }
+ get { return this[Tokens.Hint] as string; }
+ set { this[Tokens.Hint] = value; }
}
public string Help
{
- get { return this [Tokens.Help] as string; }
- set { this [Tokens.Help] = value; }
+ get { return this[Tokens.Help] as string; }
+ set { this[Tokens.Help] = value; }
}
public string ID
{
- get { return this [Tokens.ID] as string; }
- set { this [Tokens.ID] = value; }
+ get { return this[Tokens.ID] as string; }
+ set { this[Tokens.ID] = value; }
}
public string Label
{
get
{
- string label = this [Tokens.Label] as string;
- if (label==null) label = ID;
+ string label = this[Tokens.Label] as string;
+ if (label == null) label = ID;
return label;
}
- set { this [Tokens.Label] = value; }
+ set { this[Tokens.Label] = value; }
}
public IProcessor Processor
{
- get { return this [Tokens.Processor] as IProcessor; }
- set { this [Tokens.Processor] = value; }
+ get { return this[Tokens.Processor] as IProcessor; }
+ set { this[Tokens.Processor] = value; }
}
public string Required
{
- get { return this [Tokens.Required] as string; }
- set { this [Tokens.Required] = value; }
+ get { return this[Tokens.Required] as string; }
+ set { this[Tokens.Required] = value; }
}
}
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=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs Thu Sep 1 12:26:36 2005
@@ -26,6 +26,7 @@
#region Field
private bool _Strict = false;
+
public virtual bool Strict
{
get { return _Strict; }
@@ -37,8 +38,8 @@
set
{
if (value == null)
- throw new ArgumentNullException ("(value==null) || (Type!=IFieldContext)", "Nexus.Core.Tables.FieldTable.AddFieldContext");
- Field [value.ID] = value;
+ throw new ArgumentNullException("(value==null) || (Type!=IFieldContext)", "Nexus.Core.Tables.FieldTable.AddFieldContext");
+ Field[value.ID] = value;
}
}
@@ -47,19 +48,19 @@
set
{
if (value == null)
- throw new ArgumentNullException ("(value==null) || (Type!=IFieldContext)", "Nexus.Core.Tables.FieldTable.AddFieldContexts");
- IEnumerator elements = value.GetEnumerator ();
- while (elements.MoveNext ()) AddFieldContext = elements.Current as IFieldContext;
+ throw new ArgumentNullException("(value==null) || (Type!=IFieldContext)", "Nexus.Core.Tables.FieldTable.AddFieldContexts");
+ IEnumerator elements = value.GetEnumerator();
+ while (elements.MoveNext()) AddFieldContext = elements.Current as IFieldContext;
}
}
- public virtual IFieldContext GetFieldContext (string id)
+ public virtual IFieldContext GetFieldContext(string id)
{
- if (id==null) throw new ArgumentNullException ("id==null", "Nexus.Core.Tables.FieldTable.GetFieldContext");
- IFieldContext fieldContext = Field [id] as IFieldContext;
+ if (id == null) throw new ArgumentNullException("id==null", "Nexus.Core.Tables.FieldTable.GetFieldContext");
+ IFieldContext fieldContext = Field[id] as IFieldContext;
bool problem = ((fieldContext == null) && (Strict));
if (problem)
- throw new ArgumentNullException (id, "Nexus.Core.Tables.FieldTable.GetFieldContext");
+ throw new ArgumentNullException(id, "Nexus.Core.Tables.FieldTable.GetFieldContext");
return fieldContext;
}
@@ -72,8 +73,8 @@
set
{
if (value == null)
- throw new ArgumentNullException ("value==null", "Nexus.Core.Tables.FieldTable.AddProcessor");
- Processor [value.ID] = value;
+ throw new ArgumentNullException("value==null", "Nexus.Core.Tables.FieldTable.AddProcessor");
+ Processor[value.ID] = value;
}
}
@@ -82,9 +83,9 @@
set
{
if (value == null)
- throw new ArgumentNullException ("value==null", "Nexus.Core.Tables.FieldTable.AddProcessors");
- IEnumerator elements = value.GetEnumerator ();
- while (elements.MoveNext ()) AddProcessor = elements.Current as IProcessor;
+ throw new ArgumentNullException("value==null", "Nexus.Core.Tables.FieldTable.AddProcessors");
+ IEnumerator elements = value.GetEnumerator();
+ while (elements.MoveNext()) AddProcessor = elements.Current as IProcessor;
}
}
@@ -92,19 +93,19 @@
#region Text
- public virtual string Alert (string id)
+ public virtual string Alert(string id)
{
- return GetFieldContext (id).Alert;
+ return GetFieldContext(id).Alert;
}
- public virtual string Label (string id)
+ public virtual string Label(string id)
{
- return GetFieldContext (id).Label;
+ return GetFieldContext(id).Label;
}
- public virtual string Required (string id)
+ public virtual string Required(string id)
{
- return GetFieldContext (id).Required;
+ return GetFieldContext(id).Required;
}
#endregion
@@ -114,10 +115,10 @@
/// <summary>
/// Create instance with zero paramters.
/// </summary>
- public FieldTable ()
+ public FieldTable()
{
- this [Tokens.Field] = new Hashtable ();
- this [Tokens.Processor] = new Hashtable ();
+ this[Tokens.Field] = new Hashtable();
+ this[Tokens.Processor] = new Hashtable();
}
/// <summary>
@@ -125,7 +126,7 @@
/// </summary>
private IDictionary Field
{
- get { return this [Tokens.Field] as IDictionary; }
+ get { return this[Tokens.Field] as IDictionary; }
}
/// <summary>
@@ -133,7 +134,7 @@
/// </summary>
private IDictionary Processor
{
- get { return this [Tokens.Processor] as IDictionary; }
+ get { return this[Tokens.Processor] as IDictionary; }
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tables/IFieldTable.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tables/IFieldTable.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/IFieldTable.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/IFieldTable.cs Thu Sep 1 12:26:36 2005
@@ -36,7 +36,7 @@
/// <param name="id">FieldContext ID</param>
/// <returns>FieldContext for ID</returns>
///
- IFieldContext GetFieldContext (string id);
+ IFieldContext GetFieldContext(string id);
/// <summary>
/// Add a Processor to the set.
@@ -54,7 +54,7 @@
/// <param name="id">FieldContext ID</param>
/// <returns>Alert message for FieldContext ID</returns>
///
- string Alert (string id);
+ string Alert(string id);
/// <summary>
/// Provide the Label message for a given field id.
@@ -62,7 +62,7 @@
/// <param name="id">FieldContext ID</param>
/// <returns>Alert message for FieldContext ID</returns>
///
- string Label (string id);
+ string Label(string id);
/// <summary>
/// Provide the Required message for a given field id.
@@ -70,7 +70,7 @@
/// <param name="id">FieldContext ID</param>
/// <returns>Required message for FieldContext ID</returns>
///
- string Required (string id);
+ string Required(string id);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs Thu Sep 1 12:26:36 2005
@@ -28,7 +28,7 @@
///
public class Tokens
{
- private Tokens ()
+ private Tokens()
{
// No need to construct static helper class
}
@@ -243,24 +243,22 @@
/// 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/Core/Validators/ClearContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ClearContext.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ClearContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ClearContext.cs Thu Sep 1 12:26:36 2005
@@ -15,21 +15,20 @@
/// </p></remarks>
public class ClearContext : RequestCommand
{
-
/// <summary>
/// Clear from the Context any keys present in the Criteria.
/// </summary>
/// <param name="context">Context after attributes have been output to Criteria</param>
/// <returns>CONTINUE</returns>
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
ICollection keys = context.Criteria.Keys;
foreach (string key in keys)
{
- context.Remove (key);
+ context.Remove(key);
}
return CONTINUE;
}
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/CollectionProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/CollectionProcessor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/CollectionProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/CollectionProcessor.cs Thu Sep 1 12:26:36 2005
@@ -2,14 +2,13 @@
{
public class CollectionProcessor : Processor
{
-
- public override bool ConvertInput (IProcessorContext incoming)
+ public override bool ConvertInput(IProcessorContext incoming)
{
incoming.Target = incoming.Source;
return true;
}
- public override bool FormatOutput (IProcessorContext outgoing)
+ public override bool FormatOutput(IProcessorContext outgoing)
{
outgoing.Target = outgoing.Source;
return true;
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ConvertInput.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ConvertInput.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ConvertInput.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ConvertInput.cs Thu Sep 1 12:26:36 2005
@@ -8,21 +8,21 @@
/// </summary>
public class ConvertInput : ProcessorCommand
{
- public override bool ExecuteProcess (IProcessorContext incoming)
+ public override bool ExecuteProcess(IProcessorContext incoming)
{
string key = incoming.FieldKey;
IRequestContext context = incoming.Context;
IDictionary criteria = incoming.Criteria;
- bool have = (criteria.Contains (key));
+ bool have = (criteria.Contains(key));
if (have)
{
- incoming.Source = criteria [key];
- bool okay = ExecuteConvert (incoming);
+ incoming.Source = criteria[key];
+ bool okay = ExecuteConvert(incoming);
if (okay)
// set to main context
- context [key] = incoming.Target;
- else context.AddAlertForField (key);
+ context[key] = incoming.Target;
+ else context.AddAlertForField(key);
return STOP;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/DateTimeProcessor.cs Thu Sep 1 12:26:36 2005
@@ -9,15 +9,15 @@
{
#region IProcessor
- public override bool ConvertInput (IProcessorContext incoming)
+ public override bool ConvertInput(IProcessorContext incoming)
{
bool okay = false;
string source = incoming.Source as string;
- if (IsStringEmpty (source))
+ if (IsStringEmpty(source))
{
- DateTime t = DateTime_Convert (source);
- bool isDateTimeEmpty = DateTime_Empty.Equals (t);
+ DateTime t = DateTime_Convert(source);
+ bool isDateTimeEmpty = DateTime_Empty.Equals(t);
okay = !isDateTimeEmpty;
incoming.Target = t;
}
@@ -30,46 +30,46 @@
return okay;
}
- public override bool FormatOutput (IProcessorContext outgoing)
+ public override bool FormatOutput(IProcessorContext outgoing)
{
bool okay = false;
object source = outgoing.Source;
- if (IsEmpty (source))
+ if (IsEmpty(source))
{
outgoing.Target = String.Empty;
okay = true;
}
else
{
- string target = DateTime_Format (source);
+ string target = DateTime_Format(source);
outgoing.Target = target;
- okay = IsStringEmpty (target);
+ okay = IsStringEmpty(target);
}
return okay;
}
#endregion
- private bool IsStringEmpty (string v)
+ private bool IsStringEmpty(string v)
{
- return ((v != null) && (!String.Empty.Equals (v)));
+ return ((v != null) && (!String.Empty.Equals(v)));
}
private DateTime DateTime_Empty = DateTime.MinValue;
- private bool IsEmpty (object source)
+ private bool IsEmpty(object source)
{
SByte dbNull = 0;
- return ((null == source) || (DBNull.Value.Equals (source)) || (dbNull.Equals (source) || String.Empty.Equals (source)));
+ return ((null == source) || (DBNull.Value.Equals(source)) || (dbNull.Equals(source) || String.Empty.Equals(source)));
}
- private DateTime DateTime_Convert (string source)
+ private DateTime DateTime_Convert(string source)
{
DateTime t = DateTime_Empty;
try
{
- t = Convert.ToDateTime (source);
+ t = Convert.ToDateTime(source);
}
catch (InvalidCastException e)
{
@@ -83,7 +83,7 @@
}
- private string DateTime_Format (object source)
+ private string DateTime_Format(object source)
{
DateTime t = DateTime_Empty;
try
@@ -94,8 +94,8 @@
{
e = e;
}
- if (DateTime_Empty.Equals (t)) return String.Empty;
- else return t.ToString (DataFormat);
+ if (DateTime_Empty.Equals(t)) return String.Empty;
+ else return t.ToString(DataFormat);
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/EntryListProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/EntryListProcessor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/EntryListProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/EntryListProcessor.cs Thu Sep 1 12:26:36 2005
@@ -1,6 +1,5 @@
using System.Collections;
using Agility.Nexus.Validators;
-using Nexus.Core;
namespace Nexus.Core.Validators
{
@@ -16,36 +15,35 @@
///
public abstract class EntryListProcessor : Processor
{
-
- public override bool ConvertInput (IProcessorContext incoming)
+ public override bool ConvertInput(IProcessorContext incoming)
{
incoming.Target = incoming.Source;
return true;
}
- public override bool FormatOutput (IProcessorContext outgoing)
+ public override bool FormatOutput(IProcessorContext outgoing)
{
- ProcessorCommand formatter = new FormatOutput ();
+ ProcessorCommand formatter = new FormatOutput();
IList source = outgoing.Source as IList;
IEntryList target = NewEntryList();
foreach (IDictionary row in source)
{
- IRequestContext context = new RequestContext (row);
+ IRequestContext context = new RequestContext(row);
context.FieldTable = outgoing.FieldTable;
ICollection keys = row.Keys;
foreach (string key in keys)
{
- IProcessorContext _context = new ProcessorContext (key, context);
- formatter.ExecuteProcess (_context);
+ IProcessorContext _context = new ProcessorContext(key, context);
+ formatter.ExecuteProcess(_context);
}
- target.AddEntry (context.Criteria);
+ target.AddEntry(context.Criteria);
}
outgoing.Target = target;
return true;
}
-
+
/// <summary>
/// Override to return an instance of the desired IEntryList type.
/// </summary>
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs Thu Sep 1 12:26:36 2005
@@ -8,21 +8,21 @@
/// </summary>
public class FormatOutput : ProcessorCommand
{
- public override bool ExecuteProcess (IProcessorContext outgoing)
+ public override bool ExecuteProcess(IProcessorContext outgoing)
{
string key = outgoing.FieldKey;
IRequestContext context = outgoing.Context;
IDictionary criteria = outgoing.Criteria;
- bool have = (context.Contains (key));
+ bool have = (context.Contains(key));
if (have)
{
- outgoing.Source = context [key];
- bool okay = ExecuteFormat (outgoing);
+ outgoing.Source = context[key];
+ bool okay = ExecuteFormat(outgoing);
if (okay)
// set to field buffer
- criteria [key] = outgoing.Target;
- else context.AddAlertForField (key);
+ criteria[key] = outgoing.Target;
+ else context.AddAlertForField(key);
return STOP;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessor.cs Thu Sep 1 12:26:36 2005
@@ -9,7 +9,7 @@
string DataFormat { get; set; }
string ID { get; set; }
- bool ConvertInput (IProcessorContext incoming);
- bool FormatOutput (IProcessorContext outgoing);
+ bool ConvertInput(IProcessorContext incoming);
+ bool FormatOutput(IProcessorContext outgoing);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorCommand.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorCommand.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IProcessorCommand.cs Thu Sep 1 12:26:36 2005
@@ -15,21 +15,21 @@
/// </summary>
/// <param name="context">The context we are processing</param>
/// <returns>True if nominal</returns>
- bool ExecuteProcess (IProcessorContext context);
+ bool ExecuteProcess(IProcessorContext context);
/// <summary>
/// Convert a field value, utlitizing the field table and processor.
/// </summary>
/// <param name="context">The context we are processing</param>
/// <returns>True if nominal</returns>
- bool ExecuteConvert (IProcessorContext context);
+ bool ExecuteConvert(IProcessorContext context);
/// <summary>
/// Format a field value, utlitizing the field table and processor.
/// </summary>
/// <param name="context">The context we are processing</param>
/// <returns>True if nominal</returns>
- bool ExecuteFormat (IProcessorContext context);
+ bool ExecuteFormat(IProcessorContext context);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/KeyValueProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/KeyValueProcessor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/KeyValueProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/KeyValueProcessor.cs Thu Sep 1 12:26:36 2005
@@ -10,30 +10,31 @@
public class KeyValueProcessor : Processor
{
private string _Key;
+
public string Key
{
set { _Key = value; }
get { return _Key; }
}
- public override bool ConvertInput (IProcessorContext incoming)
+ public override bool ConvertInput(IProcessorContext incoming)
{
incoming.Target = incoming.Source;
return true;
}
- public override bool FormatOutput (IProcessorContext outgoing)
+ public override bool FormatOutput(IProcessorContext outgoing)
{
- ProcessorCommand formatter = new FormatOutput ();
+ ProcessorCommand formatter = new FormatOutput();
IList source = outgoing.Source as IList;
foreach (IKeyValue row in source)
{
string key = Key;
- IRequestContext context = new RequestContext ();
- context [key] = row.Value;
+ IRequestContext context = new RequestContext();
+ context[key] = row.Value;
context.FieldTable = outgoing.FieldTable;
- IProcessorContext _context = new ProcessorContext (key, context);
- formatter.ExecuteProcess (_context);
+ IProcessorContext _context = new ProcessorContext(key, context);
+ formatter.ExecuteProcess(_context);
row.Value = _context.Target;
}
outgoing.Target = outgoing.Source;
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Processor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Processor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Processor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Processor.cs Thu Sep 1 12:26:36 2005
@@ -6,6 +6,7 @@
public abstract class Processor : IProcessor
{
private string _Alert;
+
public string Alert
{
get { return _Alert; }
@@ -13,6 +14,7 @@
}
private string _DataFormat;
+
public string DataFormat
{
get { return _DataFormat; }
@@ -20,14 +22,15 @@
}
private string _ID;
+
public string ID
{
get { return _ID; }
set { _ID = value; }
}
- public abstract bool ConvertInput (IProcessorContext incoming);
+ public abstract bool ConvertInput(IProcessorContext incoming);
- public abstract bool FormatOutput (IProcessorContext outgoing);
+ public abstract bool FormatOutput(IProcessorContext outgoing);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorCommand.cs Thu Sep 1 12:26:36 2005
@@ -15,10 +15,10 @@
{
#region IRequestCommand
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- ProcessRelated (context);
- ProcessRequired (context);
+ ProcessRelated(context);
+ ProcessRequired(context);
return context.HasAlerts;
}
@@ -27,6 +27,7 @@
#region IProcessorCommand
private string _Template = null;
+
public virtual string Required
{
get { return _Template; }
@@ -40,31 +41,31 @@
/// The default behavior is to pass through the objects, verbatim.
/// </remarks>
/// <param name="context">The IProcessorContext</param>
- public virtual bool ConvertInput (IProcessorContext context)
+ public virtual bool ConvertInput(IProcessorContext context)
{
context.Target = context.Source;
return true;
}
- public virtual bool ExecuteConvert (IProcessorContext context)
+ public virtual bool ExecuteConvert(IProcessorContext context)
{
bool okay = false;
string id = context.FieldKey;
IFieldTable table = context.FieldTable;
- IFieldContext fieldContext = table.GetFieldContext (id); // enforces Strict
+ IFieldContext fieldContext = table.GetFieldContext(id); // enforces Strict
if ((fieldContext == null))
{
- ConvertInput (context);
+ ConvertInput(context);
return true;
}
IProcessor processor = fieldContext.Processor;
if (processor == null)
- okay = ConvertInput (context);
+ okay = ConvertInput(context);
else
{
- okay = processor.ConvertInput (context);
+ okay = processor.ConvertInput(context);
}
return okay;
}
@@ -77,60 +78,60 @@
/// and call ToString on everything else.
/// </remarks>
/// <param name="context">The IProcessorContext</param>
- public virtual bool FormatOutput (IProcessorContext context)
+ public virtual bool FormatOutput(IProcessorContext context)
{
- Type sourceType = context.Source.GetType ();
- if (IsCollectionType (sourceType)) context.Target = context.Source;
- else context.Target = context.Source.ToString ();
+ Type sourceType = context.Source.GetType();
+ if (IsCollectionType(sourceType)) context.Target = context.Source;
+ else context.Target = context.Source.ToString();
return true;
}
- public virtual bool ExecuteFormat (IProcessorContext context)
+ public virtual bool ExecuteFormat(IProcessorContext context)
{
bool okay = false;
string id = context.FieldKey;
object source = context.Source;
IFieldTable table = context.FieldTable;
- IFieldContext fieldContext = table.GetFieldContext (id); // Enforces Strict
+ IFieldContext fieldContext = table.GetFieldContext(id); // Enforces Strict
if ((fieldContext == null))
{
if (source == null)
context.Target = null;
- else okay = FormatOutput (context);
+ else okay = FormatOutput(context);
return true;
}
IProcessor processor = fieldContext.Processor;
if (processor == null)
- okay = FormatOutput (context);
+ okay = FormatOutput(context);
else
{
- okay = processor.FormatOutput (context);
+ okay = processor.FormatOutput(context);
}
return okay;
}
- private bool IsCollectionType (Type dataType)
+ private bool IsCollectionType(Type dataType)
{
- bool v = (typeof (ICollection)).IsAssignableFrom (dataType);
+ bool v = (typeof (ICollection)).IsAssignableFrom(dataType);
return (v);
}
- public abstract bool ExecuteProcess (IProcessorContext context);
+ public abstract bool ExecuteProcess(IProcessorContext context);
#endregion
#region ProcessRequired
- private void AssertProcessRequired (IRequestContext context)
+ private void AssertProcessRequired(IRequestContext context)
{
IDictionary criteria = context.Criteria;
if (null == criteria)
- throw new ArgumentNullException ("Criteria==null", "BaseValidator.NexusExecute.AssertProcessRequired");
+ throw new ArgumentNullException("Criteria==null", "BaseValidator.NexusExecute.AssertProcessRequired");
}
- private void ProcessRequired (IRequestContext context)
+ private void ProcessRequired(IRequestContext context)
{
IList requiredIDs = context.CommandBin.RequiredIDs; // inner list
if (requiredIDs == null) return;
@@ -138,22 +139,22 @@
IList runtimeIDs = context.CommandBin.RuntimeIDs; // inner list
if (runtimeIDs != null)
{
- IEnumerator runtime = runtimeIDs.GetEnumerator ();
- while (runtime.MoveNext ())
+ IEnumerator runtime = runtimeIDs.GetEnumerator();
+ while (runtime.MoveNext())
{
string id = runtime.Current as string;
- requiredIDs.Remove (id);
+ requiredIDs.Remove(id);
}
}
- IEnumerator required = requiredIDs.GetEnumerator ();
- while (required.MoveNext ())
+ IEnumerator required = requiredIDs.GetEnumerator();
+ while (required.MoveNext())
{
string id = required.Current as string;
- bool okay = (context.Contains (id) && (null != context [id]) && (!String.Empty.Equals (context [id].ToString ())));
+ bool okay = (context.Contains(id) && (null != context[id]) && (!String.Empty.Equals(context[id].ToString())));
if (!okay)
{
- context.AddAlertRequired (id);
+ context.AddAlertRequired(id);
}
}
}
@@ -162,34 +163,34 @@
#region ProcessRelated
- private void AssertProcessRelated (IRequestContext context)
+ private void AssertProcessRelated(IRequestContext context)
{
- AssertProcessRequired (context);
+ AssertProcessRequired(context);
IFieldTable table = context.FieldTable;
if (null == table)
- throw new ArgumentNullException ("FieldTable==null", "BaseValidator.NexusExecute.AssertProcessRelated");
+ throw new ArgumentNullException("FieldTable==null", "BaseValidator.NexusExecute.AssertProcessRelated");
}
- private void ProcessRelated (IRequestContext context)
+ private void ProcessRelated(IRequestContext context)
{
- AssertProcessRelated (context);
+ AssertProcessRelated(context);
- ICollection related = CombinedIDs (context);
+ ICollection related = CombinedIDs(context);
foreach (string key in related)
{
- IProcessorContext _context = new ProcessorContext (key, context);
- ExecuteProcess (_context);
+ IProcessorContext _context = new ProcessorContext(key, context);
+ ExecuteProcess(_context);
}
}
- private ICollection CombinedIDs (IRequestContext context)
+ private ICollection CombinedIDs(IRequestContext context)
{
- IDictionary combined = new Hashtable ();
+ IDictionary combined = new Hashtable();
IList relatedIDs = context.CommandBin.RelatedIDs; // outer list
- if (relatedIDs != null) foreach (string i in relatedIDs) combined [i] = i;
+ if (relatedIDs != null) foreach (string i in relatedIDs) combined[i] = i;
IList requiredIDs = context.CommandBin.RequiredIDs; // inner list
- if (requiredIDs != null) foreach (string i in requiredIDs) combined [i] = i;
+ if (requiredIDs != null) foreach (string i in requiredIDs) combined[i] = i;
return combined.Keys;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorContext.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/ProcessorContext.cs Thu Sep 1 12:26:36 2005
@@ -11,43 +11,43 @@
/// </summary>
public class ProcessorContext : Context, IProcessorContext
{
- public ProcessorContext ()
+ public ProcessorContext()
{
}
- public ProcessorContext (string key, object source)
+ public ProcessorContext(string key, object source)
{
FieldKey = key;
Source = source;
}
- public ProcessorContext (string key, IRequestContext context)
+ public ProcessorContext(string key, IRequestContext context)
{
FieldKey = key;
- this [Tokens.Context] = context;
+ this[Tokens.Context] = context;
}
public string FieldKey
{
- get { return this [Tokens.FieldKey] as string; }
- set { this [Tokens.FieldKey] = value; }
+ get { return this[Tokens.FieldKey] as string; }
+ set { this[Tokens.FieldKey] = value; }
}
public object Source
{
- get { return this [Tokens.Source]; }
- set { this [Tokens.Source] = value; }
+ get { return this[Tokens.Source]; }
+ set { this[Tokens.Source] = value; }
}
public object Target
{
- get { return this [Tokens.Target]; }
- set { this [Tokens.Target] = value; }
+ get { return this[Tokens.Target]; }
+ set { this[Tokens.Target] = value; }
}
public IRequestContext Context
{
- get { return this [Tokens.Context] as IRequestContext; }
+ get { return this[Tokens.Context] as IRequestContext; }
}
public IDictionary Criteria
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/StringProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/StringProcessor.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/StringProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/StringProcessor.cs Thu Sep 1 12:26:36 2005
@@ -6,17 +6,17 @@
{
#region IProcessor
- public override bool ConvertInput (IProcessorContext incoming)
+ public override bool ConvertInput(IProcessorContext incoming)
{
string source = incoming.Source as string;
- incoming.Target = String_Convert (source);
+ incoming.Target = String_Convert(source);
return true;
}
- public override bool FormatOutput (IProcessorContext outgoing)
+ public override bool FormatOutput(IProcessorContext outgoing)
{
object source = outgoing.Source;
- outgoing.Target = String_Format (source);
+ outgoing.Target = String_Format(source);
return true;
}
@@ -24,20 +24,20 @@
private string String_Empty = String.Empty;
- private string String_Convert (string source)
+ private string String_Convert(string source)
{
bool isNull = (source == null);
return isNull ? String_Empty : source;
// If null, return empty string rather than null
}
- private string String_Format (object source)
+ private string String_Format(object source)
{
string t = String_Empty;
if (source == null) return t;
string format = (DataFormat == null) ? t : DataFormat;
- if (format.Equals (t)) return source.ToString ();
- return String.Format (format, source);
+ if (format.Equals(t)) return source.ToString();
+ return String.Format(format, source);
}
/*
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/AssemblyInfo.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/AssemblyInfo.cs Thu Sep 1 12:26:36 2005
@@ -4,14 +4,14 @@
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
//
-[assembly : AssemblyTitle ("")]
-[assembly : AssemblyDescription ("")]
-[assembly : AssemblyConfiguration ("")]
-[assembly : AssemblyCompany ("")]
-[assembly : AssemblyProduct ("")]
-[assembly : AssemblyCopyright ("")]
-[assembly : AssemblyTrademark ("")]
-[assembly : AssemblyCulture ("")]
+[assembly : AssemblyTitle("")]
+[assembly : AssemblyDescription("")]
+[assembly : AssemblyConfiguration("")]
+[assembly : AssemblyCompany("")]
+[assembly : AssemblyProduct("")]
+[assembly : AssemblyCopyright("")]
+[assembly : AssemblyTrademark("")]
+[assembly : AssemblyCulture("")]
//
// Version information for an assembly consists of the following four values:
@@ -24,7 +24,7 @@
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
-[assembly : AssemblyVersion ("1.0.*")]
+[assembly : AssemblyVersion("1.0.*")]
//
// In order to sign your assembly you must specify a key to use. Refer to the
@@ -51,6 +51,6 @@
// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
// documentation for more information on this.
//
-[assembly : AssemblyDelaySign (false)]
-[assembly : AssemblyKeyFile ("")]
-[assembly : AssemblyKeyName ("")]
\ No newline at end of file
+[assembly : AssemblyDelaySign(false)]
+[assembly : AssemblyKeyFile("")]
+[assembly : AssemblyKeyName("")]
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Extras.csproj Thu Sep 1 12:26:36 2005
@@ -34,7 +34,7 @@
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
- NoWarn = ""
+ NoWarn = "1591"
Optimize = "false"
OutputPath = "bin\Debug\"
RegisterForComInterop = "false"
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=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs Thu Sep 1 12:26:36 2005
@@ -30,7 +30,6 @@
///
public class Catalog : IRequestCatalog, IApplicationContextAware
{
-
#region Messages
private const string msg_ADD_COMMAND = "This catalog instance is created through dependency injection.";
@@ -57,17 +56,17 @@
#region IRequestCatalog
- public object GetObject (string name)
+ public object GetObject(string name)
{
if (null == name)
{
- Exception e = new Exception (msg_NULL);
+ Exception e = new Exception(msg_NULL);
throw(e);
}
- object o = Factory ().GetObject (name);
+ object o = Factory().GetObject(name);
if (o == null)
{
- Exception e = new Exception (msg_MISSING);
+ Exception e = new Exception(msg_MISSING);
throw(e);
}
return o;
@@ -78,9 +77,9 @@
/// </summary>
/// <param name="name">ID for command</param>
/// <param name="command">Command instance</param>
- public void AddCommand (string name, ICommand command)
+ public void AddCommand(string name, ICommand command)
{
- throw new NotImplementedException (msg_ADD_COMMAND); // OK
+ throw new NotImplementedException(msg_ADD_COMMAND); // OK
}
/// <summary>
@@ -93,22 +92,22 @@
/// name is not in catalog,
/// or if instance for name is not a IRequestCommand
/// </exception>
- public ICommand GetCommand (string name)
+ public ICommand GetCommand(string name)
{
- object o = GetObject (name);
+ object o = GetObject(name);
IRequestCommand command = o as IRequestCommand;
if (command == null)
{
- Exception e = new Exception (msg_TYPE);
+ Exception e = new Exception(msg_TYPE);
throw(e);
}
return command;
}
- public IEnumerator GetNames ()
+ public IEnumerator GetNames()
{
- string[] names = _Factory.GetObjectDefinitionNames ();
- IEnumerator enu = names.GetEnumerator ();
+ string[] names = _Factory.GetObjectDefinitionNames();
+ IEnumerator enu = names.GetEnumerator();
return enu;
}
@@ -119,7 +118,7 @@
/// <summary>
/// Default constructor.
/// </summary>
- public Catalog ()
+ public Catalog()
{
}
@@ -127,7 +126,7 @@
/// Construct object and set ApplicationContext.
/// </summary>
/// <param name="value">Our ApplicationContext</param>
- public Catalog (IApplicationContext value)
+ public Catalog(IApplicationContext value)
{
ApplicationContext = value;
}
@@ -136,12 +135,13 @@
/// Provide the IApplicationContext instance.
/// </summary>
/// <returns>IApplicationContext instance</returns>
- public IApplicationContext Factory ()
+ public IApplicationContext Factory()
{
return _Factory;
}
private IFieldTable _FieldTable;
+
public IFieldTable FieldTable
{
get { return _FieldTable; }
@@ -149,6 +149,7 @@
}
private IRequestCommand _PreOp;
+
public IRequestCommand PreOp
{
get { return _PreOp; }
@@ -156,44 +157,45 @@
}
private IRequestCommand _PostOp;
+
public IRequestCommand PostOp
{
get { return _PostOp; }
set { _PostOp = value; }
}
- public IViewHelper GetHelper (string name)
+ public IViewHelper GetHelper(string name)
{
- object o = GetObject (name);
+ object o = GetObject(name);
IViewHelper helper = o as IViewHelper;
if (helper == null)
{
- Exception e = new Exception (msg_TYPE_HELPER);
+ Exception e = new Exception(msg_TYPE_HELPER);
throw(e);
}
return helper;
}
- public IRequestContext GetRequest (string name)
+ public IRequestContext GetRequest(string name)
{
- ICommand _command = GetCommand (name);
+ ICommand _command = GetCommand(name);
IRequestCommand _rc = _command as IRequestCommand;
- return GetRequest (_rc);
+ return GetRequest(_rc);
}
- public IRequestContext GetRequest (IRequestCommand command)
+ public IRequestContext GetRequest(IRequestCommand command)
{
IRequestContext context = null;
try
{
- context = command.NewContext ();
- context [Tokens.CommandBin] = command;
- context [Tokens.FieldTable] = FieldTable;
+ context = command.NewContext();
+ context[Tokens.CommandBin] = command;
+ context[Tokens.FieldTable] = FieldTable;
// TODO: MessageTable
}
catch (Exception e)
{
- context = new RequestContext ();
+ context = new RequestContext();
context.Fault = e;
// ISSUE: Log exception(faults) (Log all errors in verbose mode?)
// ISSUE: Provide an alternate location on fault? -- Declarative exception handing
@@ -202,9 +204,9 @@
}
- public IRequestContext GetRequest (string name, IDictionary input)
+ public IRequestContext GetRequest(string name, IDictionary input)
{
- IRequestContext context = GetRequest (name);
+ IRequestContext context = GetRequest(name);
context.Criteria = input;
return context;
}
@@ -214,37 +216,37 @@
/// </summary>
/// <param name="context">IRequestContext to verify</param>
/// <returns>The non-null Command for this Context</returns>
- private IRequestCommand VerifyRequest (IRequestContext context)
+ private IRequestCommand VerifyRequest(IRequestContext context)
{
if (null == context)
{
- context = new RequestContext ();
- context.AddAlert (msg_CATALOG_CONTEXT_NULL);
+ context = new RequestContext();
+ context.AddAlert(msg_CATALOG_CONTEXT_NULL);
}
- IRequestCommand command = context [Tokens.CommandBin] as IRequestCommand;
+ IRequestCommand command = context[Tokens.CommandBin] as IRequestCommand;
if (null == command)
- context.AddAlert (msg_CATALOG_COMMAND_NULL);
+ context.AddAlert(msg_CATALOG_COMMAND_NULL);
return command;
}
- public IRequestContext ExecuteRequest (string name)
+ public IRequestContext ExecuteRequest(string name)
{
- IRequestContext context = GetRequest (name);
- ExecuteRequest (context);
+ IRequestContext context = GetRequest(name);
+ ExecuteRequest(context);
return context;
}
- public void ExecuteRequest (IRequestContext context)
+ public void ExecuteRequest(IRequestContext context)
{
- IRequestCommand command = VerifyRequest (context);
+ IRequestCommand command = VerifyRequest(context);
if (context.IsNominal)
{
try
{
- command.Execute (context);
+ command.Execute(context);
}
catch (Exception e)
{
@@ -256,18 +258,18 @@
// ISSUE: Provide an alternate location on fault? -- Declarative exception handing?
}
- public void ExecuteView (IRequestContext context)
+ public void ExecuteView(IRequestContext context)
{
- IRequestCommand command = VerifyRequest (context);
+ IRequestCommand command = VerifyRequest(context);
if (context.IsNominal)
{
- IChain chain = new Chain ();
- if (_PreOp!=null) chain.AddCommand (_PreOp);
- chain.AddCommand (command);
- if (_PostOp!=null) chain.AddCommand (_PostOp);
+ IChain chain = new Chain();
+ if (_PreOp != null) chain.AddCommand(_PreOp);
+ chain.AddCommand(command);
+ if (_PostOp != null) chain.AddCommand(_PostOp);
try
{
- chain.Execute (context);
+ chain.Execute(context);
}
catch (Exception e)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org