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/06/15 21:12:54 UTC
svn commit: r190792 - in /struts/sandbox/trunk/overdrive/Nexus: Core/
Core/Helpers/ Core/Tables/ Core/Validators/ Extras/Spring/ Test/
Test/Commands/
Author: husted
Date: Wed Jun 15 12:12:52 2005
New Revision: 190792
URL: http://svn.apache.org/viewcvs?rev=190792&view=rev
Log:
OVR-15
* Code formatting only. No changes.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestChain.cs
struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs
struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.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/Tokens.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IValidator.cs
struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Validator.cs
struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.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
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=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/ViewHelper.cs Wed Jun 15 12:12:52 2005
@@ -112,14 +112,14 @@
public string Prefix
{
- get { return Context[Tokens.Prefix] as string; }
- set { Context[Tokens.Prefix] = value; }
+ get { return Context [Tokens.Prefix] as string; }
+ set { Context [Tokens.Prefix] = value; }
}
public string ListSuffix
{
- get { return Context[Tokens.ListSuffix] as string; }
- set { Context[Tokens.ListSuffix] = value; }
+ get { return Context [Tokens.ListSuffix] as string; }
+ set { Context [Tokens.ListSuffix] = value; }
}
#endregion
@@ -130,32 +130,33 @@
{
get
{
- bool v = (Boolean) Context[Tokens.NullIfEmpty];
+ bool v = (Boolean) Context [Tokens.NullIfEmpty];
return v;
}
set
- { Boolean b = new Boolean();
- bool v = b.Equals (true) ? true : false ;
- Context[Tokens.NullIfEmpty] = v;
+ {
+ Boolean b = new Boolean ();
+ bool v = b.Equals (true) ? true : false;
+ Context [Tokens.NullIfEmpty] = v;
}
}
public string SelectItemPrompt
{
- get { return Context[Tokens.SelectItemPrompt] as string; }
- set { Context[Tokens.SelectItemPrompt] = value; }
+ get { return Context [Tokens.SelectItemPrompt] as string; }
+ set { Context [Tokens.SelectItemPrompt] = value; }
}
public IRequestCatalog Catalog
{
- get { return Context[Tokens.Catalog] as IRequestCatalog; }
- set { Context[Tokens.Catalog] = value; }
+ get { return Context [Tokens.Catalog] as IRequestCatalog; }
+ set { Context [Tokens.Catalog] = value; }
}
public IRequestCommand Command
{
- get { return Context[Tokens.Command] as IRequestCommand; }
- set { Context[Tokens.Command] = value; }
+ get { return Context [Tokens.Command] as IRequestCommand; }
+ set { Context [Tokens.Command] = value; }
}
#endregion
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestCatalog.cs Wed Jun 15 12:12:52 2005
@@ -25,7 +25,6 @@
///
public interface IRequestCatalog : ICatalog
{
-
/// <summary>
/// Obtain a IRequestContext for command ID,
/// including embedded resources.
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestChain.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestChain.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestChain.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestChain.cs Wed Jun 15 12:12:52 2005
@@ -5,7 +5,7 @@
/// <summary>
/// Composite IChain and IRequestCommand.
/// </summary>
- public interface IRequestChain: IChain, IRequestCommand
+ public interface IRequestChain : IChain, IRequestCommand
{
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/IRequestContext.cs Wed Jun 15 12:12:52 2005
@@ -38,7 +38,6 @@
///
public interface IRequestContext : IContext
{
-
#region Processing
/// <summary>
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestChain.cs Wed Jun 15 12:12:52 2005
@@ -9,7 +9,6 @@
/// </summary>
public class RequestChain : RequestCommand, IRequestChain
{
-
private Chain chain = new Chain ();
public void AddCommand (ICommand _command)
@@ -56,4 +55,4 @@
}
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/RequestContext.cs Wed Jun 15 12:12:52 2005
@@ -27,7 +27,6 @@
///
public class RequestContext : Context, IRequestContext
{
-
/// <summary>
/// Express state as a key=value list.
/// </summary>
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=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldContext.cs Wed Jun 15 12:12:52 2005
@@ -1,6 +1,5 @@
using System;
using Agility.Core;
-using Nexus.Core.Tables;
namespace Nexus.Core.Tables
{
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=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tables/FieldTable.cs Wed Jun 15 12:12:52 2005
@@ -231,7 +231,7 @@
try
{
// t = System.Convert.ToDateTime (input);
- t = System.Convert.ToDateTime (input);
+ t = Convert.ToDateTime (input);
}
catch (InvalidCastException e)
{
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Tokens.cs Wed Jun 15 12:12:52 2005
@@ -45,7 +45,7 @@
///
public const string Property = "_Property";
*/
-
+
/// <summary>
/// Token for Alert property.
/// </summary>
@@ -205,7 +205,6 @@
///
public const string Target = "_Target";
-
#endregion
#region Command elements
@@ -228,7 +227,6 @@
///
public const string FIELD_TABLE_ID = "FieldTable";
-
#endregion
#region Control Type Names
@@ -244,6 +242,5 @@
public const string SELECT_CONTROL = "select";
#endregion
-
}
}
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=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/FormatOutput.cs Wed Jun 15 12:12:52 2005
@@ -1,5 +1,3 @@
-using Nexus.Core.Validators;
-
namespace Nexus.Core.Validators
{
/// <summary>
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IValidator.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IValidator.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IValidator.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/IValidator.cs Wed Jun 15 12:12:52 2005
@@ -1,5 +1,3 @@
-using Nexus.Core;
-
namespace Nexus.Core.Validators
{
/// <summary>
Modified: struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Validator.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Validator.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Validator.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Validators/Validator.cs Wed Jun 15 12:12:52 2005
@@ -77,36 +77,36 @@
switch (mode)
{
case MODE_INPUT:
- {
- have = (fields.Contains (key));
- if (have)
{
- string source = fields [key] as string;
- // TODO: Spring?
- IValidatorContext _context = new ValidatorContext (key, source);
- okay = table.Convert (_context);
- if (okay)
- // set to main context
- context [key] = _context.Target;
+ have = (fields.Contains (key));
+ if (have)
+ {
+ string source = fields [key] as string;
+ // TODO: Spring?
+ IValidatorContext _context = new ValidatorContext (key, source);
+ okay = table.Convert (_context);
+ if (okay)
+ // set to main context
+ context [key] = _context.Target;
+ }
+ break;
}
- break;
- }
case MODE_OUTPUT:
- {
- have = (context.Contains (key));
- if (have)
{
- object source = context [key];
- // TODO: Spring?
- IValidatorContext _context = new ValidatorContext (key, source);
- okay = table.Format (_context);
- if (okay)
- // set to field buffer
- fields [key] = _context.Target;
+ have = (context.Contains (key));
+ if (have)
+ {
+ object source = context [key];
+ // TODO: Spring?
+ IValidatorContext _context = new ValidatorContext (key, source);
+ okay = table.Format (_context);
+ if (okay)
+ // set to field buffer
+ fields [key] = _context.Target;
+ }
+ break;
}
- break;
- }
}
if ((have) && (!okay))
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=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Catalog.cs Wed Jun 15 12:12:52 2005
@@ -29,7 +29,6 @@
///
public class Catalog : IRequestCatalog, IApplicationContextAware
{
-
#region Messages
private const string msg_ADD_COMMAND = "This catalog instance is created through dependency injection.";
@@ -170,11 +169,11 @@
public IRequestContext GetRequest (string command)
{
- ICommand _command = GetCommand(command);
+ ICommand _command = GetCommand (command);
IRequestCommand _rc = _command as IRequestCommand;
- return GetRequest(_rc);
+ return GetRequest (_rc);
}
-
+
public IRequestContext GetRequest (IRequestCommand command)
{
IRequestContext context = null;
@@ -196,19 +195,19 @@
}
- public IRequestContext GetRequest(string command, IDictionary input) {
-
- IRequestContext context = GetRequest(command);
+ public IRequestContext GetRequest (string command, IDictionary input)
+ {
+ IRequestContext context = GetRequest (command);
context.Criteria = input;
- return context;
- }
+ return context;
+ }
/// <summary>
/// Confirm that the Context is not null, and the Context's Command is not null.
/// </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)
{
@@ -219,23 +218,21 @@
IRequestCommand command = context [Tokens.CommandBin] as IRequestCommand;
if (null == command)
- {
context.AddAlert (msg_CATALOG_COMMAND_NULL);
- }
return command;
}
public IRequestContext ExecuteRequest (string command)
{
- IRequestContext context = GetRequest(command);
- ExecuteRequest(context);
+ IRequestContext context = GetRequest (command);
+ ExecuteRequest (context);
return context;
}
public void ExecuteRequest (IRequestContext context)
- {
- IRequestCommand command = VerifyRequest(context);
+ {
+ IRequestCommand command = VerifyRequest (context);
if (context.IsNominal)
{
try
@@ -254,8 +251,9 @@
public void ExecuteView (IRequestContext context)
{
- IRequestCommand command = VerifyRequest(context);
- if (context.IsNominal) {
+ IRequestCommand command = VerifyRequest (context);
+ if (context.IsNominal)
+ {
IChain chain = new Chain ();
chain.AddCommand (GetCommand (Tokens.PRE_OP_ID));
chain.AddCommand (command);
@@ -272,6 +270,5 @@
}
#endregion
-
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs Wed Jun 15 12:12:52 2005
@@ -1,5 +1,4 @@
using System;
-using Nexus.Core;
namespace Nexus.Core.Commands
{
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs Wed Jun 15 12:12:52 2005
@@ -32,7 +32,7 @@
[Test]
public void ExecuteRequest ()
{
- IRequestContext context = catalog.ExecuteRequest(ListAll.LIST_ALL);
+ IRequestContext context = catalog.ExecuteRequest (ListAll.LIST_ALL);
AssertNominal (context);
Assert.IsTrue (context.IsNominal, "Expected nominal result.");
Assert.IsTrue (context.HasOutcome, "Expected outcome from command.");
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs?rev=190792&r1=190791&r2=190792&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs Wed Jun 15 12:12:52 2005
@@ -11,11 +11,10 @@
[TestFixture]
public class ObjectByKeyTest : BaseNexusTest
{
-
public const string OBJECT_BY_KEY = "ObjectByKey";
public const string OBJECT_BY_KEY_WITH_VALIDATE = "ObjectByKeyWithValidate";
public const string OBJECT_BY_KEY_WITH_REQUIRED = "ObjectByKeyWithRequired";
-
+
private string PK_SOMETHING = ObjectByKey.PK_SOMETHING;
private string PK_SOMETHING_VALUE = ObjectByKey.PK_SOMETHING_VALUE;
private const string PK_SOMETHING_RESULT = ObjectByKey.PK_SOMETHING_RESULT;
@@ -62,7 +61,7 @@
[Test]
public void ObjectByKey_UnTrusted_Fail ()
{
- IDictionary fields = new Hashtable();
+ IDictionary fields = new Hashtable ();
IRequestContext context = catalog.GetRequest (OBJECT_BY_KEY_WITH_REQUIRED, fields);
catalog.ExecuteRequest (context); // do the actual work
@@ -107,7 +106,7 @@
[Test]
public void ObjectByKey_Format_Date ()
{
- IDictionary fields = new Hashtable();
+ IDictionary fields = new Hashtable ();
fields [PK_SOMETHING] = PK_SOMETHING_VALUE;
fields [PK_SOME_DATE] = DateTime.Now.ToShortDateString ();
IRequestContext context = catalog.GetRequest (OBJECT_BY_KEY_WITH_VALIDATE, fields);
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org