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 [2/3] - in /struts/sandbox/trunk/overdrive/Nexus: ./
Core/ Core/Helpers/ Core/Profile/ Core/Tables/ Core/Validators/ Extras/
Extras/Spring/ Test/ Test/Commands/ Web/
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/FieldContext.cs Thu Sep 1 12:26:36 2005
@@ -41,32 +41,33 @@
[Serializable]
public class FieldContext : Context, IFieldContext
{
- public FieldContext () : base ()
+ public FieldContext() : base()
{
ControlTypeName = Tokens.CONTROL_INPUT; // Default
}
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 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 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; }
}
#region text properties
private IMessageSource _MessageSource;
+
/// <summary>
/// Identify the message source for this FieldContext.
/// </summary>
@@ -75,8 +76,8 @@
/// </exception>
public IMessageSource MessageSource
{
- get{ return _MessageSource; }
- set{ _MessageSource = value; }
+ get { return _MessageSource; }
+ set { _MessageSource = value; }
}
/// <summary>
@@ -127,36 +128,36 @@
string text = null;
IProcessor processor = Processor;
string id = null;
- if (processor!=null) id = processor.ID;
- if (id!=null) text = GetMessageOrNull(id + suffix);
- if (text==null)
+ if (processor != null) id = processor.ID;
+ if (id != null) text = GetMessageOrNull(id + suffix);
+ if (text == null)
{
text = GetMessageOrNull(root + suffix);
}
- if (text==null)
+ if (text == null)
{
text = GetMessageOrNull(suffix);
}
- if (text==null) text = root + suffix;
-
+ if (text == null) text = root + suffix;
+
return text;
}
public string Alert
{
- get { return GetText(this.ID,"_alert"); }
+ get { return GetText(this.ID, "_alert"); }
set { throw new NotSupportedException(); }
}
public string Hint
{
- get { return GetText(this.ID,"_hint"); }
+ get { return GetText(this.ID, "_hint"); }
set { throw new NotSupportedException(); }
}
public string Help
{
- get { return GetText(this.ID,"_help"); }
+ get { return GetText(this.ID, "_help"); }
set { throw new NotSupportedException(); }
}
@@ -165,7 +166,7 @@
get
{
string label = GetMessageOrNull(this.ID + "_label");
- if (label==null) label = ID;
+ if (label == null) label = ID;
return label;
}
set { throw new NotSupportedException(); }
@@ -173,11 +174,10 @@
public string Required
{
- get { return GetText(this.ID,"_required"); }
+ get { return GetText(this.ID, "_required"); }
set { throw new NotSupportedException(); }
}
#endregion
-
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Objects.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Objects.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Objects.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Extras/Spring/Objects.cs Thu Sep 1 12:26:36 2005
@@ -23,18 +23,18 @@
{
private static string FILE = "/Objects.xml";
- private Objects ()
+ private Objects()
{
// private constructor prevents instantiation.
}
// ISSUE: Remove this kludge and adopt latest iBATIS approach.
private static string _rootDirectory =
- AppDomain.CurrentDomain.BaseDirectory.Replace (@"\bin", "").Replace (@"\Debug", "").Replace (@"\Release", "");
+ AppDomain.CurrentDomain.BaseDirectory.Replace(@"\bin", "").Replace(@"\Debug", "").Replace(@"\Release", "");
private static volatile IApplicationContext _Factory = null;
- public static IApplicationContext Factory ()
+ public static IApplicationContext Factory()
{
if (_Factory == null)
{
@@ -42,7 +42,7 @@
{
string foo = "file://" + _rootDirectory + FILE;
if (_Factory == null) // double-check
- _Factory = new XmlApplicationContext (foo);
+ _Factory = new XmlApplicationContext(foo);
}
}
return _Factory;
Modified: struts/sandbox/trunk/overdrive/Nexus/Nexus.sln
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Nexus.sln?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Nexus.sln (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Nexus.sln Thu Sep 1 12:26:36 2005
@@ -12,7 +12,7 @@
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "http://localhost/Nexus/Web.csproj", "{0CEB9BDE-7AA3-4239-8898-EFFB88CDDD93}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Web", "http://localhost/Nexus/Web.csproj", "{2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}"
ProjectSection(ProjectDependencies) = postProject
EndProjectSection
EndProject
@@ -34,10 +34,10 @@
{7931CACD-0E73-4DD2-A373-FF6A01CE6186}.Debug.Build.0 = Debug|.NET
{7931CACD-0E73-4DD2-A373-FF6A01CE6186}.Release.ActiveCfg = Release|.NET
{7931CACD-0E73-4DD2-A373-FF6A01CE6186}.Release.Build.0 = Release|.NET
- {0CEB9BDE-7AA3-4239-8898-EFFB88CDDD93}.Debug.ActiveCfg = Debug|.NET
- {0CEB9BDE-7AA3-4239-8898-EFFB88CDDD93}.Debug.Build.0 = Debug|.NET
- {0CEB9BDE-7AA3-4239-8898-EFFB88CDDD93}.Release.ActiveCfg = Release|.NET
- {0CEB9BDE-7AA3-4239-8898-EFFB88CDDD93}.Release.Build.0 = Release|.NET
+ {2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Debug.ActiveCfg = Debug|.NET
+ {2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Debug.Build.0 = Debug|.NET
+ {2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Release.ActiveCfg = Release|.NET
+ {2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}.Release.Build.0 = Release|.NET
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
EndGlobalSection
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/AssemblyInfo.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/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/Test/BaseNexusTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/BaseNexusTest.cs Thu Sep 1 12:26:36 2005
@@ -42,10 +42,10 @@
/// </summary>
///
[SetUp]
- public virtual void SetUp ()
+ public virtual void SetUp()
{
- IApplicationContext factory = Objects.Factory ();
- catalog = factory.GetObject ("Catalog") as IRequestCatalog;
+ IApplicationContext factory = Objects.Factory();
+ catalog = factory.GetObject("Catalog") as IRequestCatalog;
}
/// <summary>
@@ -53,9 +53,9 @@
/// </summary>
///
[Test]
- public void AssertSetUp ()
+ public void AssertSetUp()
{
- Assert.IsTrue (catalog != null, "Expected non-null catalog.");
+ Assert.IsTrue(catalog != null, "Expected non-null catalog.");
}
#region IRequestContext tests
@@ -66,12 +66,12 @@
/// <param name="context">Context to process</param>
/// <param name="keys">Keys to verify</param>
/// <returns>True if contact contains each key in keys</returns>
- protected bool ContainsKeys (IContext context, string[] keys)
+ protected bool ContainsKeys(IContext context, string[] keys)
{
bool found = true;
foreach (string key in keys)
{
- found = found && context.Contains (key);
+ found = found && context.Contains(key);
}
return found;
}
@@ -82,15 +82,15 @@
/// <param name="context">Context to process</param>
/// <param name="keys">Keys to verify</param>
/// <returns>True if Criteria for contact contains each key in keys</returns>
- public bool ContainsCriteriaKeys (IRequestContext context, string[] keys)
+ public bool ContainsCriteriaKeys(IRequestContext context, string[] keys)
{
- if (!context.HasCriteria ()) return false;
+ if (!context.HasCriteria()) return false;
IDictionary criteria = context.Criteria;
bool found = true;
foreach (string v in keys)
{
- found = found && criteria.Contains (v);
+ found = found && criteria.Contains(v);
}
return found;
}
@@ -101,11 +101,11 @@
/// </summary>
/// <param name="context">Context under test</param>
///
- public void AssertNoFault (IRequestContext context)
+ public void AssertNoFault(IRequestContext context)
{
bool hasFault = context.HasFault;
if (hasFault)
- Assert.Fail (context.Fault.Message);
+ Assert.Fail(context.Fault.Message);
}
/// <summary>
@@ -114,31 +114,31 @@
/// </summary>
/// <param name="context">Context under test</param>
///
- public void AssertNominal (IRequestContext context)
+ public void AssertNominal(IRequestContext context)
{
- AssertNoFault (context);
+ AssertNoFault(context);
bool hasAlerts = context.HasAlerts;
if (hasAlerts)
{
// TODO: Use new TextOnly method here.
- StringBuilder outer = new StringBuilder ();
+ StringBuilder outer = new StringBuilder();
IDictionary store = context.Alerts;
ICollection keys = store.Keys;
foreach (string key in keys)
{
- StringBuilder inner = new StringBuilder ();
- inner.Append (key);
- inner.Append (": ");
- IList messages = store [key] as IList;
+ StringBuilder inner = new StringBuilder();
+ inner.Append(key);
+ inner.Append(": ");
+ IList messages = store[key] as IList;
foreach (string message in messages)
{
- inner.Append (message);
- inner.Append (";");
+ inner.Append(message);
+ inner.Append(";");
}
- outer.Append (inner.ToString ());
- outer.Append ("/n");
+ outer.Append(inner.ToString());
+ outer.Append("/n");
}
- Assert.Fail (outer.ToString ());
+ Assert.Fail(outer.ToString());
}
}
@@ -148,11 +148,11 @@
/// </summary>
/// <param name="helper">Helper under test</param>
///
- public void AssertNominal (IViewHelper helper)
- {
+ public void AssertNominal(IViewHelper helper)
+ {
bool hasFault = helper.HasFault;
if (hasFault)
- Assert.Fail (helper.Fault.Message);
+ Assert.Fail(helper.Fault.Message);
bool hasAlerts = helper.HasAlerts;
if (hasAlerts)
@@ -167,11 +167,11 @@
/// <param name="context">The context to check</param>
/// <param name="key">The key</param>
/// <param name="value">The value</param>
- protected void AssertKey (IDictionary context, string key, string value)
+ protected void AssertKey(IDictionary context, string key, string value)
{
- Assert.IsNotNull (value, "Value is null");
- Assert.IsNotNull (key, "Key is null");
- Assert.IsTrue (value.Equals (context [key]), "Key:Value mismatch: " + key + ":" + value);
+ Assert.IsNotNull(value, "Value is null");
+ Assert.IsNotNull(key, "Key is null");
+ Assert.IsTrue(value.Equals(context[key]), "Key:Value mismatch: " + key + ":" + value);
}
/// <summary>
@@ -179,9 +179,9 @@
/// </summary>
/// <param name="context">The context to check</param>
/// <param name="keys">The keys to check</param>
- protected void AssertKeys (IRequestContext context, string[] keys)
+ protected void AssertKeys(IRequestContext context, string[] keys)
{
- Assert.IsTrue (ContainsKeys (context,keys), "Missing keys.");
+ Assert.IsTrue(ContainsKeys(context, keys), "Missing keys.");
}
/// <summary>
@@ -191,14 +191,14 @@
/// </summary>
/// <param name="context">The context to check</param>
/// <param name="keys">The list keys</param>
- protected void AssertListKeys (IRequestContext context, string[] keys)
+ protected void AssertListKeys(IRequestContext context, string[] keys)
{
- AssertKeys (context, keys);
+ AssertKeys(context, keys);
foreach (string key in keys)
{
- IList list = context [key] as IList;
- Assert.IsNotNull (list, "List is null: " + key);
- Assert.IsTrue (list.Count > 0, "List is empty");
+ IList list = context[key] as IList;
+ Assert.IsNotNull(list, "List is null: " + key);
+ Assert.IsTrue(list.Count > 0, "List is empty");
}
}
@@ -206,9 +206,9 @@
/// Call AssertList(string,int) with no minimum.
/// </summary>
/// <param name="id"></param>
- protected IRequestContext AssertList (string id)
+ protected IRequestContext AssertList(string id)
{
- return AssertList (id, 0);
+ return AssertList(id, 0);
}
/// <summary>
@@ -219,15 +219,16 @@
/// and that the IList containes at list minCount items.
/// </summary>
/// <param name="id">The List Command to check</param>
- protected IRequestContext AssertList (string id, int minCount)
+ /// <param name="minCount">The minimum number of items</param>
+ protected IRequestContext AssertList(string id, int minCount)
{
- IRequestContext context = catalog.GetRequest (id);
- catalog.ExecuteRequest (context);
- AssertNominal (context);
- Assert.IsTrue (context.HasOutcome, "Expected outcome");
+ IRequestContext context = catalog.GetRequest(id);
+ catalog.ExecuteRequest(context);
+ AssertNominal(context);
+ Assert.IsTrue(context.HasOutcome, "Expected outcome");
IList list = context.Outcome as IList;
- Assert.IsNotNull (list, "Expected outcome as IList");
- Assert.IsTrue (list.Count >= minCount, "Expected list entries");
+ Assert.IsNotNull(list, "Expected outcome as IList");
+ Assert.IsTrue(list.Count >= minCount, "Expected list entries");
return context;
}
@@ -240,10 +241,10 @@
/// for use with other routine tests.
/// </summary>
/// <param name="context"></param>
- protected virtual void Populate (IDictionary context)
+ protected virtual void Populate(IDictionary context)
{
// override to populate context
- throw new NotImplementedException ("CatalogBaseTest.Populate must be overridden.");
+ throw new NotImplementedException("CatalogBaseTest.Populate must be overridden.");
}
/// <summary>
@@ -254,29 +255,29 @@
/// <param name="keyId">The name of the primary key field</param>
/// <param name="keyValue">The primary key value initially set by Populate</param>
/// <param name="deleteId">The "delete" command name</param>
- protected IRequestContext AssertInsertDelete (string insertId, string keyId, string keyValue, string deleteId)
+ protected IRequestContext AssertInsertDelete(string insertId, string keyId, string keyValue, string deleteId)
{
- IRequestContext context = catalog.GetRequest (insertId);
- Populate (context);
- context [keyId] = String.Empty;
-
- catalog.ExecuteRequest (context);
- AssertNominal (context);
- Assert.IsFalse (keyValue.Equals (context [keyId]), "Expected new primary key");
-
- ICommand delete = catalog.GetCommand (deleteId);
- delete.Execute (context);
- AssertNominal (context);
+ IRequestContext context = catalog.GetRequest(insertId);
+ Populate(context);
+ context[keyId] = String.Empty;
+
+ catalog.ExecuteRequest(context);
+ AssertNominal(context);
+ Assert.IsFalse(keyValue.Equals(context[keyId]), "Expected new primary key");
+
+ ICommand delete = catalog.GetCommand(deleteId);
+ delete.Execute(context);
+ AssertNominal(context);
return context;
}
- protected IRequestContext AssertEdit (string editId, string keyId, string keyValue, string[] keys)
+ protected IRequestContext AssertEdit(string editId, string keyId, string keyValue, string[] keys)
{
- IRequestContext context = catalog.GetRequest (editId);
- context [keyId] = keyValue;
- catalog.ExecuteRequest (context);
- AssertNominal (context);
- Assert.IsTrue (ContainsKeys (context,keys), "Missing fields");
+ IRequestContext context = catalog.GetRequest(editId);
+ context[keyId] = keyValue;
+ catalog.ExecuteRequest(context);
+ AssertNominal(context);
+ Assert.IsTrue(ContainsKeys(context, keys), "Missing fields");
return context;
}
@@ -286,17 +287,16 @@
/// <param name="updateId">The "save" command</param>
/// <param name="keyId">The name of the primary key</param>
/// <param name="keyValue">The value of the primary key</param>
- protected IRequestContext AssertUpdate (string updateId, string keyId, string keyValue)
+ protected IRequestContext AssertUpdate(string updateId, string keyId, string keyValue)
{
- IRequestContext context = catalog.GetRequest (updateId);
- Populate (context);
- catalog.ExecuteRequest (context);
- AssertNominal (context);
- Assert.IsTrue (keyValue.Equals (context [keyId]));
+ IRequestContext context = catalog.GetRequest(updateId);
+ Populate(context);
+ catalog.ExecuteRequest(context);
+ AssertNominal(context);
+ Assert.IsTrue(keyValue.Equals(context[keyId]));
return context;
}
#endregion
-
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ListAll.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ListAll.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ListAll.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ListAll.cs Thu Sep 1 12:26:36 2005
@@ -35,12 +35,12 @@
///
private const string DATA = "data";
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
// IList list = Mapper.Get ().QueryForList (ID, context);
// Fake it:
- IList list = new ArrayList ();
- list.Add (DATA);
+ IList list = new ArrayList();
+ list.Add(DATA);
context.Outcome = list;
return CONTINUE;
}
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=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/Commands/ObjectByKey.cs Thu Sep 1 12:26:36 2005
@@ -13,14 +13,14 @@
public const string PK_SOMETHING_RESULT = "SomethingResult";
public const string PK_SOME_DATE = "SomeDate";
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- string value = context [PK_SOMETHING] as string;
+ string value = context[PK_SOMETHING] as string;
// IList list = Mapper.Get ().QueryForObject (ID, key);
- if (PK_SOMETHING_VALUE.Equals (value))
+ if (PK_SOMETHING_VALUE.Equals(value))
{
- context [PK_SOMETHING_RESULT] = PK_SOMETHING_RESULT;
- context [PK_SOME_DATE] = DateTime.Now;
+ context[PK_SOMETHING_RESULT] = PK_SOMETHING_RESULT;
+ context[PK_SOME_DATE] = DateTime.Now;
}
return CONTINUE;
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/ControllerTest.cs Thu Sep 1 12:26:36 2005
@@ -30,12 +30,12 @@
/// </summary>
///
[Test]
- public void ExecuteRequest ()
+ public void ExecuteRequest()
{
- IRequestContext context = catalog.ExecuteRequest (ListAll.LIST_ALL);
- AssertNominal (context);
- Assert.IsTrue (context.IsNominal, "Expected nominal result.");
- Assert.IsTrue (context.HasOutcome, "Expected outcome from command.");
+ 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=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/ObjectByKeyTest.cs Thu Sep 1 12:26:36 2005
@@ -20,114 +20,114 @@
private const string PK_SOMETHING_RESULT = ObjectByKey.PK_SOMETHING_RESULT;
private const string PK_SOME_DATE = ObjectByKey.PK_SOME_DATE;
- public void AssertSomething (IRequestContext context)
+ public void AssertSomething(IRequestContext context)
{
- AssertNominal (context);
- Assert.IsNotNull (context [PK_SOMETHING_RESULT], "Expected result");
- Assert.IsFalse (context.HasOutcome, "Unexpected Outcome.");
+ AssertNominal(context);
+ Assert.IsNotNull(context[PK_SOMETHING_RESULT], "Expected result");
+ Assert.IsFalse(context.HasOutcome, "Unexpected Outcome.");
}
- public void AssertInvalid (IRequestContext context)
+ public void AssertInvalid(IRequestContext context)
{
- AssertNoFault (context);
- Assert.IsTrue (context.HasAlerts, "Expected error");
- Assert.IsNull (context [PK_SOMETHING_RESULT], "Unexpected result");
- Assert.IsFalse (context.HasOutcome, "Unexpected Outcome.");
+ AssertNoFault(context);
+ Assert.IsTrue(context.HasAlerts, "Expected error");
+ Assert.IsNull(context[PK_SOMETHING_RESULT], "Unexpected result");
+ Assert.IsFalse(context.HasOutcome, "Unexpected Outcome.");
}
[Test]
- public void ObjectByKey_Trusted ()
+ public void ObjectByKey_Trusted()
{
- IRequestContext context = catalog.GetRequest (OBJECT_BY_KEY);
- context [PK_SOMETHING] = PK_SOMETHING_VALUE;
+ IRequestContext context = catalog.GetRequest(OBJECT_BY_KEY);
+ context[PK_SOMETHING] = PK_SOMETHING_VALUE;
- catalog.ExecuteRequest (context); // do the actual work
+ catalog.ExecuteRequest(context); // do the actual work
- AssertSomething (context);
+ AssertSomething(context);
}
[Test]
- public void ObjectByKey_UnTrusted ()
+ public void ObjectByKey_UnTrusted()
{
- IDictionary fields = new Hashtable ();
- fields [PK_SOMETHING] = PK_SOMETHING_VALUE;
- IRequestContext context = catalog.GetRequest (OBJECT_BY_KEY_WITH_REQUIRED, fields);
+ IDictionary fields = new Hashtable();
+ fields[PK_SOMETHING] = PK_SOMETHING_VALUE;
+ IRequestContext context = catalog.GetRequest(OBJECT_BY_KEY_WITH_REQUIRED, fields);
- catalog.ExecuteRequest (context); // do the actual work
+ catalog.ExecuteRequest(context); // do the actual work
- AssertSomething (context);
+ AssertSomething(context);
}
[Test]
- public void ObjectByKey_UnTrusted_Fail ()
+ public void ObjectByKey_UnTrusted_Fail()
{
- IDictionary fields = new Hashtable ();
- IRequestContext context = catalog.GetRequest (OBJECT_BY_KEY_WITH_REQUIRED, fields);
+ IDictionary fields = new Hashtable();
+ IRequestContext context = catalog.GetRequest(OBJECT_BY_KEY_WITH_REQUIRED, fields);
- catalog.ExecuteRequest (context); // do the actual work
+ catalog.ExecuteRequest(context); // do the actual work
- AssertInvalid (context);
+ AssertInvalid(context);
}
[Test]
- public void ObjectByKey_Process ()
+ public void ObjectByKey_Process()
{
- IDictionary fields = new Hashtable ();
- fields [PK_SOMETHING] = PK_SOMETHING_VALUE;
+ 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);
+ IRequestContext context = catalog.GetRequest(OBJECT_BY_KEY_WITH_VALIDATE, fields);
- catalog.ExecuteRequest (context); // do the actual work
+ catalog.ExecuteRequest(context); // do the actual work
- AssertSomething (context);
+ AssertSomething(context);
try
{
- DateTime output = (DateTime) context [PK_SOME_DATE];
+ DateTime output = (DateTime) context[PK_SOME_DATE];
output = output;
}
catch (Exception e)
{
- Assert.IsTrue (e != null);
- Assert.Fail ("Expected date as binary in the main context");
+ Assert.IsTrue(e != null);
+ Assert.Fail("Expected date as binary in the main context");
}
- string shortDate = context.Criteria [PK_SOME_DATE] as string;
- Assert.IsNotNull (shortDate, "Expected date as a string in criteria");
+ string shortDate = context.Criteria[PK_SOME_DATE] as string;
+ Assert.IsNotNull(shortDate, "Expected date as a string in criteria");
DateTime now = DateTime.Now;
// http://www.microsoft.com/globaldev/getWR/steps/wrg_date.mspx
// Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US");
- string expect = now.ToString ("d");
- Assert.AreEqual (expect, shortDate);
+ string expect = now.ToString("d");
+ Assert.AreEqual(expect, shortDate);
}
[Test]
- public void ObjectByKey_Format_Date ()
+ public void ObjectByKey_Format_Date()
{
- 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);
+ 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);
- catalog.ExecuteRequest (context); // do the actual work
+ catalog.ExecuteRequest(context); // do the actual work
- AssertSomething (context);
+ AssertSomething(context);
try
{
- DateTime output = (DateTime) context [PK_SOME_DATE];
+ DateTime output = (DateTime) context[PK_SOME_DATE];
output = output;
}
catch (Exception e)
{
- Assert.IsTrue (e != null);
- Assert.Fail ("Expected date as binary in the main context");
+ Assert.IsTrue(e != null);
+ Assert.Fail("Expected date as binary in the main context");
}
- string formatted = context.Criteria [PK_SOME_DATE] as string;
- Assert.IsNotNull (formatted, "Expected date as a string in criteria");
+ string formatted = context.Criteria[PK_SOME_DATE] as string;
+ Assert.IsNotNull(formatted, "Expected date as a string in criteria");
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/RequestCommandTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/RequestCommandTest.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/RequestCommandTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/RequestCommandTest.cs Thu Sep 1 12:26:36 2005
@@ -32,9 +32,9 @@
/// </summary>
///
[SetUp]
- public void SetUp ()
+ public void SetUp()
{
- command = new ListAll ();
+ command = new ListAll();
}
/// <summary>
@@ -42,21 +42,21 @@
/// </summary>
///
[Test]
- public void NewRequestContext ()
+ public void NewRequestContext()
{
- IRequestContext context = command.NewContext ();
- Assert.IsNotNull (context, "Expected default context instance.");
+ IRequestContext context = command.NewContext();
+ Assert.IsNotNull(context, "Expected default context instance.");
}
/// <summary>
/// A successful command returns a nominal result.
/// </summary>
///
- public void RequestExecute ()
+ public void RequestExecute()
{
- IRequestContext context = command.NewContext ();
- command.Execute (context);
- Assert.IsTrue (context.IsNominal, "Expected nominal result.");
+ IRequestContext context = command.NewContext();
+ command.Execute(context);
+ Assert.IsTrue(context.IsNominal, "Expected nominal result.");
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/RequestContextTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/RequestContextTest.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/RequestContextTest.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/RequestContextTest.cs Thu Sep 1 12:26:36 2005
@@ -36,17 +36,17 @@
/// </summary>
///
[SetUp]
- public void SetUp ()
+ public void SetUp()
{
- context = new RequestContext ();
+ context = new RequestContext();
context.Command = "list_all";
- context.CommandBin = new ListAll ();
- Assert.IsTrue (context.IsNominal, "Expected nominal state for a new IRequestContext.");
- Assert.IsFalse (context.HasOutcome, "Expected no Outcome for a new IRequestContext.");
+ context.CommandBin = new ListAll();
+ Assert.IsTrue(context.IsNominal, "Expected nominal state for a new IRequestContext.");
+ Assert.IsFalse(context.HasOutcome, "Expected no Outcome for a new IRequestContext.");
- fault = new ApplicationException ("RequestContextTest");
- list = new ArrayList ();
- list.Add ("data");
+ fault = new ApplicationException("RequestContextTest");
+ list = new ArrayList();
+ list.Add("data");
}
/// <summary>
@@ -54,10 +54,10 @@
/// </summary>
///
[Test]
- public void IsNominal_Alert ()
+ public void IsNominal_Alert()
{
- context.AddAlert ("Business logic alert");
- Assert.IsFalse (context.IsNominal, "Expected non-nominal state after adding alert message.");
+ context.AddAlert("Business logic alert");
+ Assert.IsFalse(context.IsNominal, "Expected non-nominal state after adding alert message.");
}
/// <summary>
@@ -65,11 +65,11 @@
/// </summary>
///
[Test]
- public void IsNominal_Fault ()
+ public void IsNominal_Fault()
{
context.Fault = fault;
- Assert.IsFalse (context.IsNominal,
- "Expected non-nominal state after setting Exception.");
+ Assert.IsFalse(context.IsNominal,
+ "Expected non-nominal state after setting Exception.");
}
/// <summary>
@@ -78,13 +78,13 @@
/// </summary>
///
[Test]
- public void IsNominal_Errors_and_Fault ()
+ public void IsNominal_Errors_and_Fault()
{
- context.AddAlert ("Business logic error");
- context.AddAlert ("Business logic error 2");
+ context.AddAlert("Business logic error");
+ context.AddAlert("Business logic error 2");
context.Fault = fault;
- Assert.IsFalse (context.IsNominal,
- "Expected non-nominal state after adding errors and Exception.");
+ Assert.IsFalse(context.IsNominal,
+ "Expected non-nominal state after adding errors and Exception.");
}
/// <summary>
@@ -92,10 +92,10 @@
/// </summary>
///
[Test]
- public void HasOutcome ()
+ public void HasOutcome()
{
context.Outcome = list;
- Assert.IsTrue (context.HasOutcome);
+ Assert.IsTrue(context.HasOutcome);
}
}
Modified: struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Test/Test.csproj Thu Sep 1 12:26:36 2005
@@ -12,7 +12,7 @@
AssemblyName = "Nexus.Test"
AssemblyOriginatorKeyFile = ""
DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
+ DefaultHTMLPageLayout = "Flow"
DefaultTargetSchema = "IE50"
DelaySign = "false"
OutputType = "Library"
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/AssemblyInfo.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/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
@@ -55,6 +55,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/Web/BaseGridPage.aspx
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx Thu Sep 1 12:26:36 2005
@@ -1,4 +1,4 @@
-<%@ Page language="c#" Codebehind="BaseGridPage.aspx.cs" AutoEventWireup="true" Inherits="Nexus.Web.BaseGridPage" %>
+<%@ Page language="c#" Codebehind="BaseGridPage.aspx.cs" AutoEventWireup="false" Inherits="Nexus.Web.BaseGridPage" %>
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
<html>
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/BaseGridPage.aspx.cs Thu Sep 1 12:26:36 2005
@@ -3,7 +3,6 @@
using System.Web.UI.WebControls;
using Nexus.Core;
using Nexus.Core.Helpers;
-using Nexus.Web;
using Spring.Web.UI;
namespace Nexus.Web
@@ -47,10 +46,10 @@
/// </p></remarks>
public class BaseGridPage : Page
{
-
#region Helper
private IGridViewHelper _GridHelper;
+
/// <summary>
/// Encapsulate three Helpers that work together
/// to Find, List, and Save DataGrid entries.
@@ -67,6 +66,7 @@
#region Page Properties
private IViewHelper _Page_Error;
+
///<summary>
///Handle error messages.
///</summary>
@@ -76,11 +76,12 @@
/// </p></remarks>
protected virtual IViewHelper Page_Error
{
- set {_Page_Error = value;}
- get {return _Page_Error;}
+ set { _Page_Error = value; }
+ get { return _Page_Error; }
}
private string _Page_Prompt;
+
///<summary>
///Handle page prompts.
///</summary>
@@ -89,9 +90,10 @@
/// </p></remarks>
protected virtual string Page_Prompt
{
- set {_Page_Prompt = value;}
- get {return _Page_Prompt;}
+ set { _Page_Prompt = value; }
+ get { return _Page_Prompt; }
}
+
#endregion
#region Page Properties
@@ -108,15 +110,15 @@
{
get
{
- IDictionary criteria = ViewState [LIST_CRITERIA_KEY] as IDictionary;
- if (criteria==null)
+ IDictionary criteria = ViewState[LIST_CRITERIA_KEY] as IDictionary;
+ if (criteria == null)
{
criteria = new Hashtable();
- ViewState [LIST_CRITERIA_KEY] = criteria;
+ ViewState[LIST_CRITERIA_KEY] = criteria;
}
return criteria;
}
- set { ViewState [LIST_CRITERIA_KEY] = value; }
+ set { ViewState[LIST_CRITERIA_KEY] = value; }
}
/// <summary>
@@ -131,13 +133,13 @@
{
get
{
- object value = ViewState [LIST_ITEM_INDEX];
+ object value = ViewState[LIST_ITEM_INDEX];
if (value == null) return -1;
return (int) value;
}
set
{
- ViewState [LIST_ITEM_INDEX] = value;
+ ViewState[LIST_ITEM_INDEX] = value;
if (list_report != null) list_report.EditItemIndex = value;
}
}
@@ -152,8 +154,8 @@
/// </summary>
protected virtual string List_ItemKey
{
- get { return ViewState [LIST_ITEM_KEY] as string; }
- set { ViewState [LIST_ITEM_KEY] = value; }
+ get { return ViewState[LIST_ITEM_KEY] as string; }
+ set { ViewState[LIST_ITEM_KEY] = value; }
}
/// <summary>
@@ -168,13 +170,13 @@
{
get
{
- object value = ViewState [LIST_INSERT_KEY];
+ object value = ViewState[LIST_INSERT_KEY];
if (value == null) return false;
return (bool) value;
}
set
{
- ViewState [LIST_INSERT_KEY] = value;
+ ViewState[LIST_INSERT_KEY] = value;
list_add_command.Visible = !value;
}
}
@@ -191,7 +193,7 @@
/// <summary>
/// Initialize controls within Find panel.
/// </summary>
- protected virtual void Find_Init ()
+ protected virtual void Find_Init()
{
// override to provide functionality
}
@@ -199,7 +201,7 @@
/// <summary>
/// Load controls within Find panel.
/// </summary>
- protected virtual void Find_Load ()
+ protected virtual void Find_Load()
{
// override to provide functionality
}
@@ -209,12 +211,12 @@
/// </summary>
/// <param name="sender">Event source</param>
/// <param name="e">Event</param>
- protected virtual void Find_Submit (object sender, EventArgs e)
+ protected virtual void Find_Submit(object sender, EventArgs e)
{
IGridViewHelper h = GridHelper;
- h.Read (pnlFind.Controls);
+ h.Read(pnlFind.Controls);
List_Criteria = h.FindHelper.Criteria;
- List_Load ();
+ List_Load();
}
#endregion
@@ -246,10 +248,10 @@
/// Filter entries and update display.
/// </summary>
/// <returns>True if nominal</returns>
- protected virtual bool List_Load ()
+ protected virtual bool List_Load()
{
IGridViewHelper h = GridHelper;
- bool okay = h.Load (list_report, List_Criteria);
+ bool okay = h.Load(list_report, List_Criteria);
if (okay)
{
// Template_Load(h.TitleText,h.HeadingText,h.PromptText);
@@ -274,7 +276,7 @@
/// <remarks></remarks>
/// <param name="commandName">Name of command for the Item event</param>
/// <param name="index">Index of DataGrid entry causing the event</param>
- protected virtual void List_Item (string commandName, int index)
+ protected virtual void List_Item(string commandName, int index)
{
switch (commandName)
{
@@ -282,14 +284,14 @@
// Handled by List_PageIndexChanged
break;
default:
- {
- if (List_Insert)
- // ISSUE: If insert fails, old input is not retained. [WNE-67]
- List_Add_Load ();
- else
- List_Refresh ();
- break;
- }
+ {
+ if (List_Insert)
+ // ISSUE: If insert fails, old input is not retained. [WNE-67]
+ List_Add_Load();
+ else
+ List_Refresh();
+ break;
+ }
}
}
@@ -297,22 +299,22 @@
/// Invoke edit mode for the selected entry.
/// </summary>
/// <param name="index">Index of selected entry</param>
- protected virtual void List_Edit (int index)
+ protected virtual void List_Edit(int index)
{
Page_Prompt = GetMessage(Tokens.HINT_EDIT);
List_ItemIndex = index;
- List_Refresh ();
+ List_Refresh();
}
/// <summary>
/// Exit edit mode without changing the entry.
/// </summary>
- protected virtual void List_Quit ()
+ protected virtual void List_Quit()
{
Page_Prompt = GetMessage(Tokens.HINT_SUCCESS_QUIT);
List_Insert = false;
List_ItemIndex = -1;
- List_Refresh ();
+ List_Refresh();
}
/// <summary>
@@ -321,28 +323,28 @@
/// </summary>
/// <param name="key">Entry key</param>
/// <param name="controls">Controls in the selected cell</param>
- protected virtual void List_Save (string key, ICollection controls)
+ protected virtual void List_Save(string key, ICollection controls)
{
- IGridViewHelper h = GridHelper;
- bool okay = h.Save (key, controls);
+ IGridViewHelper h = GridHelper;
+ bool okay = h.Save(key, controls);
if (okay)
{
- okay = h.List (list_report);
+ okay = h.List(list_report);
Page_Prompt = (List_Insert) ? GetMessage(Tokens.HINT_SUCCESS_ADD) : GetMessage(Tokens.HINT_SUCCESS_EDIT);
List_Insert = false;
List_ItemIndex = -1;
- List_Refresh ();
+ List_Refresh();
}
- if (!okay) Page_Error = h.SaveHelper;
+ if (!okay) Page_Error = h.SaveHelper;
}
/// <summary>
/// Rebind the datasource to the grid.
/// </summary>
- protected virtual void List_Refresh ()
+ protected virtual void List_Refresh()
{
IGridViewHelper h = GridHelper;
- h.DataBind (list_report);
+ h.DataBind(list_report);
list_panel.Visible = true;
}
@@ -350,10 +352,10 @@
/// Insert a blank entry in the datagrid
/// so that a new entry can be added inline.
/// </summary>
- protected virtual void List_Add_Load ()
+ protected virtual void List_Add_Load()
{
IGridViewHelper h = GridHelper;
- bool okay = h.DataInsert (list_report);
+ bool okay = h.DataInsert(list_report);
if (okay)
{
Page_Prompt = GetMessage(Tokens.HINT_EDIT);
@@ -372,7 +374,7 @@
/// otherwise, the DataGrid may try to select an item
/// that is outside the new found set.
/// </p></remarks>
- protected void List_ResetIndex ()
+ protected void List_ResetIndex()
{
list_report.SelectedIndex = 0;
list_report.CurrentPageIndex = 0; // sic
@@ -387,16 +389,16 @@
/// <summary>
/// Initialize controls in the List panel.
/// </summary>
- private void List_Init ()
+ private void List_Init()
{
list_report.AutoGenerateColumns = false;
list_report.EditItemIndex = List_ItemIndex;
- list_report.CancelCommand += new DataGridCommandEventHandler (this.List_Quit);
- list_report.EditCommand += new DataGridCommandEventHandler (this.List_Edit);
- list_report.UpdateCommand += new DataGridCommandEventHandler (this.List_Save);
- list_report.ItemCommand += new DataGridCommandEventHandler (this.List_Item);
- list_report.PageIndexChanged += new DataGridPageChangedEventHandler (this.List_PageIndexChanged);
- list_add_command.Click += new EventHandler (this.List_Add);
+ list_report.CancelCommand += new DataGridCommandEventHandler(this.List_Quit);
+ list_report.EditCommand += new DataGridCommandEventHandler(this.List_Edit);
+ list_report.UpdateCommand += new DataGridCommandEventHandler(this.List_Save);
+ list_report.ItemCommand += new DataGridCommandEventHandler(this.List_Item);
+ list_report.PageIndexChanged += new DataGridPageChangedEventHandler(this.List_PageIndexChanged);
+ list_add_command.Click += new EventHandler(this.List_Add);
}
// postback events
@@ -406,9 +408,9 @@
/// </summary>
/// <param name="source">Event source</param>
/// <param name="e">Event</param>
- protected void List_Edit (object source, DataGridCommandEventArgs e)
+ protected void List_Edit(object source, DataGridCommandEventArgs e)
{
- List_Edit (e.Item.ItemIndex);
+ List_Edit(e.Item.ItemIndex);
}
/// <summary>
@@ -416,12 +418,12 @@
/// </summary>
/// <param name="source">Event</param>
/// <param name="e"></param>
- protected void List_Save (object source, DataGridCommandEventArgs e)
+ protected void List_Save(object source, DataGridCommandEventArgs e)
{
IGridViewHelper h = GridHelper;
- string key = (List_Insert) ? null : h.GetDataKey (e, list_report);
- ICollection controls = h.GetControls (e, list_report);
- List_Save (key, controls);
+ string key = (List_Insert) ? null : h.GetDataKey(e, list_report);
+ ICollection controls = h.GetControls(e, list_report);
+ List_Save(key, controls);
}
/// <summary>
@@ -429,9 +431,9 @@
/// </summary>
/// <param name="source"></param>
/// <param name="e"></param>
- protected void List_Quit (object source, DataGridCommandEventArgs e)
+ protected void List_Quit(object source, DataGridCommandEventArgs e)
{
- List_Quit ();
+ List_Quit();
}
/// <summary>
@@ -439,9 +441,9 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- protected virtual void List_Add (object sender, EventArgs e)
+ protected virtual void List_Add(object sender, EventArgs e)
{
- List_Add_Load ();
+ List_Add_Load();
}
/// <summary>
@@ -449,10 +451,10 @@
/// </summary>
/// <param name="source"></param>
/// <param name="e"></param>
- protected void List_Item (object source, DataGridCommandEventArgs e)
+ protected void List_Item(object source, DataGridCommandEventArgs e)
{
int index = e.Item.ItemIndex;
- List_Item (e.CommandName, index);
+ List_Item(e.CommandName, index);
}
/// <summary>
@@ -460,10 +462,10 @@
/// </summary>
/// <param name="sender"></param>
/// <param name="e"></param>
- protected void List_PageIndexChanged (object sender, DataGridPageChangedEventArgs e)
+ protected void List_PageIndexChanged(object sender, DataGridPageChangedEventArgs e)
{
list_report.CurrentPageIndex = e.NewPageIndex;
- List_Refresh ();
+ List_Refresh();
}
#endregion
@@ -478,14 +480,14 @@
/// <remarks><p>
/// Call if overridden.
/// </p></remarks>
- protected virtual void Page_Init ()
+ protected virtual void Page_Init()
{
- Find_Init ();
- List_Init ();
+ Find_Init();
+ List_Init();
if (!IsPostBack)
{
- list_panel.Visible = false;
+ list_panel.Visible = false;
}
}
@@ -495,16 +497,15 @@
/// <remarks><p>
/// Call if overridden.
/// </p></remarks>
- protected virtual void Page_Load (object sender, EventArgs e)
+ protected virtual void Page_Load(object sender, EventArgs e)
{
-
if (!IsPostBack)
{
- Find_Load ();
+ Find_Load();
}
if (list_panel.Visible)
- List_Load ();
+ List_Load();
}
/// <summary>
@@ -519,4 +520,4 @@
#endregion
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Global.asax.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Global.asax.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/Global.asax.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/Global.asax.cs Thu Sep 1 12:26:36 2005
@@ -14,40 +14,40 @@
/// </summary>
private IContainer components = null;
- public Global ()
+ public Global()
{
- InitializeComponent ();
+ InitializeComponent();
}
- protected void Application_Start (Object sender, EventArgs e)
+ protected void Application_Start(Object sender, EventArgs e)
{
}
- protected void Session_Start (Object sender, EventArgs e)
+ protected void Session_Start(Object sender, EventArgs e)
{
}
- protected void Application_BeginRequest (Object sender, EventArgs e)
+ protected void Application_BeginRequest(Object sender, EventArgs e)
{
}
- protected void Application_EndRequest (Object sender, EventArgs e)
+ protected void Application_EndRequest(Object sender, EventArgs e)
{
}
- protected void Application_AuthenticateRequest (Object sender, EventArgs e)
+ protected void Application_AuthenticateRequest(Object sender, EventArgs e)
{
}
- protected void Application_Error (Object sender, EventArgs e)
+ protected void Application_Error(Object sender, EventArgs e)
{
}
- protected void Session_End (Object sender, EventArgs e)
+ protected void Session_End(Object sender, EventArgs e)
{
}
- protected void Application_End (Object sender, EventArgs e)
+ protected void Application_End(Object sender, EventArgs e)
{
}
@@ -57,9 +57,9 @@
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
- private void InitializeComponent ()
+ private void InitializeComponent()
{
- this.components = new Container ();
+ this.components = new Container();
}
#endregion
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridViewHelper.cs Thu Sep 1 12:26:36 2005
@@ -5,7 +5,6 @@
using Nexus.Core;
using Nexus.Core.Helpers;
using Nexus.Core.Tables;
-using Nexus.Web;
using Spring.Context;
namespace Nexus.Web
@@ -15,7 +14,6 @@
/// </summary>
public abstract class GridViewHelper : WebViewHelper, IGridViewHelper
{
-
#region IViewHelper
/// <remarks><p>
@@ -24,15 +22,15 @@
/// </p></remarks>
public override bool IsNominal
{
- get { return FindHelper.IsNominal && ListHelper.IsNominal && SaveHelper.IsNominal; }
+ get { return FindHelper.IsNominal && ListHelper.IsNominal && SaveHelper.IsNominal; }
}
#endregion
#region IListViewHelper
-
private IViewHelper _SaveHelper;
+
public virtual IViewHelper SaveHelper
{
get { return _SaveHelper; }
@@ -40,6 +38,7 @@
}
private IViewHelper _FindHelper;
+
public virtual IViewHelper FindHelper
{
get { return _FindHelper; }
@@ -47,6 +46,7 @@
}
private IViewHelper _ListHelper;
+
public virtual IViewHelper ListHelper
{
get { return _ListHelper; }
@@ -54,6 +54,7 @@
}
private bool _HasItemColumn = false;
+
public virtual bool HasItemColumn
{
get { return _HasItemColumn; }
@@ -63,10 +64,11 @@
public virtual bool HasEditColumn
{
get { return (SaveHelper != null); }
- set { throw new NotImplementedException (); }
+ set { throw new NotImplementedException(); }
}
private bool _HasCriteria = true;
+
public virtual bool HasCriteria
{
get { return _HasCriteria; }
@@ -74,6 +76,7 @@
}
private string _DataKeyField;
+
public virtual string DataKeyField
{
get { return _DataKeyField; }
@@ -83,6 +86,7 @@
#region text properties
private IMessageSource _MessageSource;
+
/// <summary>
/// Identify the message source for this FieldContext.
/// </summary>
@@ -91,8 +95,8 @@
/// </exception>
public IMessageSource MessageSource
{
- get{ return _MessageSource; }
- set{ _MessageSource = value; }
+ get { return _MessageSource; }
+ set { _MessageSource = value; }
}
/// <summary>
@@ -144,130 +148,130 @@
#region IGridViewHelper
- public virtual bool Load (DataGrid grid, IDictionary criteria)
+ public virtual bool Load(DataGrid grid, IDictionary criteria)
{
if (HasCriteria)
- ExecuteList (grid, criteria);
+ ExecuteList(grid, criteria);
else
- ExecuteList (grid);
+ ExecuteList(grid);
return ListHelper.IsNominal;
}
- public virtual bool Find (ICollection controls)
+ public virtual bool Find(ICollection controls)
{
- FindHelper.Execute ();
+ FindHelper.Execute();
FindHelper.Bind(controls);
- return FindHelper.IsNominal ;
+ return FindHelper.IsNominal;
}
- public virtual bool List (ICollection controls)
+ public virtual bool List(ICollection controls)
{
- ListHelper.ReadExecute (controls);
- return ListHelper.IsNominal ;
+ ListHelper.ReadExecute(controls);
+ return ListHelper.IsNominal;
}
- public virtual bool List (DataGrid grid)
+ public virtual bool List(DataGrid grid)
{
ListHelper.Execute();
- bool okay = ListHelper.IsNominal ;
+ bool okay = ListHelper.IsNominal;
if (okay)
{
- DataSource (grid);
- DataBind (grid);
+ DataSource(grid);
+ DataBind(grid);
}
return okay;
}
- public virtual bool Save (string key, ICollection controls)
+ public virtual bool Save(string key, ICollection controls)
{
if (SaveHelper.IsNominal)
{
- SaveHelper.Criteria [DataKeyField] = key;
+ SaveHelper.Criteria[DataKeyField] = key;
int cols = FieldSet.Count;
string[] keys = new string[2 + cols];
// reconstruct the standard edit column keys
// just as placeholders, really
- keys [0] = SaveText;
- keys [1] = QuitText;
+ keys[0] = SaveText;
+ keys[1] = QuitText;
int index = 2;
// append our field names to the array of keys
for (int i = 0; i < cols; i++)
{
- IFieldContext fc = FieldSet[i] as IFieldContext;
- keys [index++] = fc.ID;
+ IFieldContext fc = FieldSet[i] as IFieldContext;
+ keys[index++] = fc.ID;
}
- ReadGridControls (controls, SaveHelper.Criteria, keys, SaveHelper.NullIfEmpty);
+ ReadGridControls(controls, SaveHelper.Criteria, keys, SaveHelper.NullIfEmpty);
SaveHelper.Execute();
}
- return SaveHelper.IsNominal ;
+ return SaveHelper.IsNominal;
}
- public virtual int BindItemColumn (DataGrid grid, int i)
+ public virtual int BindItemColumn(DataGrid grid, int i)
{
- ButtonColumn column = new ButtonColumn ();
+ ButtonColumn column = new ButtonColumn();
column.ButtonType = ButtonColumnType.PushButton;
column.Text = ItemText;
column.CommandName = ItemCommandName;
- grid.Columns.AddAt (i, column);
+ grid.Columns.AddAt(i, column);
return ++i;
}
- public virtual int BindEditColumn (DataGrid grid, int i)
+ public virtual int BindEditColumn(DataGrid grid, int i)
{
- EditCommandColumn column = new EditCommandColumn ();
+ EditCommandColumn column = new EditCommandColumn();
column.ButtonType = ButtonColumnType.PushButton;
column.EditText = EditText;
column.CancelText = QuitText;
column.UpdateText = SaveText;
- grid.Columns.AddAt (i, column);
+ grid.Columns.AddAt(i, column);
return ++i;
}
- public virtual int BindColumns (DataGrid grid, int i)
+ public virtual int BindColumns(DataGrid grid, int i)
{
grid.DataKeyField = DataKeyField;
int colCount = FieldSet.Count;
for (int c = 0; c < colCount; c++)
{
- IFieldContext fc = FieldSet [c] as IFieldContext;
+ IFieldContext fc = FieldSet[c] as IFieldContext;
string column = fc.ID;
string label = fc.Label;
- if ((label==null) || (label.Length==0)) label = column;
- i = BindColumn (grid, i, label, column);
+ if ((label == null) || (label.Length == 0)) label = column;
+ i = BindColumn(grid, i, label, column);
}
return i;
}
- public virtual void DataSource (DataGrid grid)
+ public virtual void DataSource(DataGrid grid)
{
IList list = ListHelper.Outcome;
grid.DataSource = list;
}
- public abstract IEntryList NewEntryList ();
+ public abstract IEntryList NewEntryList();
- public virtual bool DataInsert (DataGrid grid)
+ public virtual bool DataInsert(DataGrid grid)
{
// Fake a blank row
- IEntryList list = NewEntryList ();
- list.Insert (String.Empty);
- ListHelper.Criteria [ListHelper.Command.ID] = list;
+ IEntryList list = NewEntryList();
+ list.Insert(String.Empty);
+ ListHelper.Criteria[ListHelper.Command.ID] = list;
grid.DataSource = list;
grid.CurrentPageIndex = 0;
grid.EditItemIndex = 0;
- DataBind (grid);
- return ListHelper.IsNominal ;
+ DataBind(grid);
+ return ListHelper.IsNominal;
}
- public virtual void DataBind (DataGrid grid)
+ public virtual void DataBind(DataGrid grid)
{
- grid.DataBind ();
+ grid.DataBind();
}
private bool bind = true;
- public virtual void BindGrid (DataGrid grid)
+ public virtual void BindGrid(DataGrid grid)
{
// Only bind columns once
// WARNING: Won't work with a singleton
@@ -275,24 +279,24 @@
{
bind = false;
int i = 0;
- if (HasEditColumn) i = BindEditColumn (grid, i);
- if (HasItemColumn) i = BindItemColumn (grid, i);
- BindColumns (grid, i);
+ if (HasEditColumn) i = BindEditColumn(grid, i);
+ if (HasItemColumn) i = BindItemColumn(grid, i);
+ BindColumns(grid, i);
}
- DataSource (grid);
- DataBind (grid);
+ DataSource(grid);
+ DataBind(grid);
}
- public virtual bool ExecuteList (DataGrid grid)
+ public virtual bool ExecuteList(DataGrid grid)
{
- ListHelper.Execute();
- bool okay = ListHelper.IsNominal ;
- if (okay) BindGrid (grid);
+ ListHelper.Execute();
+ bool okay = ListHelper.IsNominal;
+ if (okay) BindGrid(grid);
return okay;
}
- public virtual bool ExecuteList (DataGrid grid, IDictionary criteria)
+ public virtual bool ExecuteList(DataGrid grid, IDictionary criteria)
{
IDictionary target = ListHelper.Criteria;
foreach (DictionaryEntry e in criteria)
@@ -302,25 +306,24 @@
return ExecuteList(grid);
}
- public string GetDataKey (DataGridCommandEventArgs e, DataGrid grid)
+ public string GetDataKey(DataGridCommandEventArgs e, DataGrid grid)
{
int index = grid.EditItemIndex;
- string key = grid.DataKeys [index] as string;
+ string key = grid.DataKeys[index] as string;
return key;
}
- public ICollection GetControls (DataGridCommandEventArgs e, DataGrid grid)
+ public ICollection GetControls(DataGridCommandEventArgs e, DataGrid grid)
{
- ControlCollection controls = new ControlCollection (grid);
+ ControlCollection controls = new ControlCollection(grid);
foreach (TableCell t in e.Item.Cells)
{
for (int i = 0; i < t.Controls.Count; i++)
- controls.Add (t.Controls [i]);
+ controls.Add(t.Controls[i]);
}
return controls;
}
#endregion
-
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/IGridViewHelper.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/IGridViewHelper.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/IGridViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/IGridViewHelper.cs Thu Sep 1 12:26:36 2005
@@ -93,33 +93,33 @@
/// <param name="grid">The instant DataGrid.</param>
/// <param name="criteria">Search criteria, if any.</param>
/// <returns>True if no errors were detected.</returns>
- bool Load (DataGrid grid, IDictionary criteria);
+ bool Load(DataGrid grid, IDictionary criteria);
/// <summary>
/// Execute find (what?) command (enter search criteria).
/// </summary>
/// <param name="controls">The list of controls to which to bind values.</param>
- bool Find (ICollection controls);
+ bool Find(ICollection controls);
/// <summary>
/// Execute list command (filter records based on search criteria).
/// </summary>
/// <param name="controls">The list of controls from which to obtain the values to filter.</param>
- bool List (ICollection controls);
+ bool List(ICollection controls);
/// <summary>
/// Execute list command (filter records based on search criteria).
/// </summary>
/// <param name="grid">The instant datagrid.</param>
/// <returns>True if no errors were detected.</returns>
- bool List (DataGrid grid);
+ bool List(DataGrid grid);
/// <summary>
/// Execute save command for the given key, using the given control collection.
/// </summary>
/// <param name="key">The primary key for the entity being saved.</param>
/// <param name="controls">The list of controls from which to obtain the values to save.</param>
- bool Save (string key, ICollection controls);
+ bool Save(string key, ICollection controls);
/// <summary>
/// Create a standard datagrid button column.
@@ -127,7 +127,7 @@
/// <param name="grid">Our datagrid instance</param>
/// <param name="i">The first column to use, usually 0</param>
/// <returns>The next column to use, usually 1</returns>
- int BindItemColumn (DataGrid grid, int i);
+ int BindItemColumn(DataGrid grid, int i);
/// <summary>
/// Create a standard datagrid edit column.
@@ -135,7 +135,7 @@
/// <param name="grid">Our datagrid instance</param>
/// <param name="i">The first column to use, usually 0</param>
/// <returns>The next column to use, usually 1</returns>
- int BindEditColumn (DataGrid grid, int i);
+ int BindEditColumn(DataGrid grid, int i);
/// <summary>
/// Bind whatever columns need to be displayed for this data type.
@@ -143,7 +143,7 @@
/// <param name="grid">Our datagrid instance</param>
/// <param name="i">The first column to use, usually 1</param>
/// <returns>The next column to use</returns>
- int BindColumns (DataGrid grid, int i);
+ int BindColumns(DataGrid grid, int i);
/// <summary>
/// Use the Listcommand to obtain a datasource.
@@ -152,13 +152,13 @@
/// Usually called just before DataBind.
/// </comment>
/// <param name="grid">Our datagrid instance</param>
- void DataSource (DataGrid grid);
+ void DataSource(DataGrid grid);
/// <summary>
/// Ccreate a blank row in the datagrid.
/// </summary>
/// <param name="grid">Our datagrid instance</param>
- bool DataInsert (DataGrid grid);
+ bool DataInsert(DataGrid grid);
/// <summary>
/// Bind our datagrid to the datasource.
@@ -167,20 +167,20 @@
/// Usually called just after DataSource.
/// </p></remarks>
/// <param name="grid">Our datagrid instance</param>
- void DataBind (DataGrid grid);
+ void DataBind(DataGrid grid);
/// <summary>
/// Bind the columns and datasource to the DataGrid.
/// </summary>
/// <param name="grid">A DataGrid instance</param>
- void BindGrid (DataGrid grid);
+ void BindGrid(DataGrid grid);
/// <summary>
/// Run ExecuteContext using the ListHelper, and bind the result.
/// </summary>
/// <param name="grid">A DataGrid instance</param>
/// <returns>True if the Context is nominal.</returns>
- bool ExecuteList (DataGrid grid);
+ bool ExecuteList(DataGrid grid);
/// <summary>
/// Run Execute using the ListHelper and supplied criteria, and bind the result.
@@ -188,7 +188,7 @@
/// <param name="grid">A DataGrid instance</param>
/// <param name="criteria">Criteria values</param>
/// <returns>True if the Context is nominal.</returns>
- bool ExecuteList (DataGrid grid, IDictionary criteria);
+ bool ExecuteList(DataGrid grid, IDictionary criteria);
/// <summary>
/// Obtain the DataKey value from a DataGrid.
@@ -196,7 +196,7 @@
/// <param name="e">Current event</param>
/// <param name="grid">The DataGrid</param>
/// <returns>The DataKey Value as a string</returns>
- string GetDataKey (DataGridCommandEventArgs e, DataGrid grid);
+ string GetDataKey(DataGridCommandEventArgs e, DataGrid grid);
/// <summary>
/// Create a collection of the controls based on the current DataGrid cell.
@@ -204,10 +204,8 @@
/// <param name="e">Current event</param>
/// <param name="grid">The DataGrid</param>
/// <returns>Collection of controls in the current DataGrid cell</returns>
- ICollection GetControls (DataGridCommandEventArgs e, DataGrid grid);
+ ICollection GetControls(DataGridCommandEventArgs e, DataGrid grid);
#endregion
-
-
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/NexusDataGrid.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/NexusDataGrid.cs?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/NexusDataGrid.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/NexusDataGrid.cs Thu Sep 1 12:26:36 2005
@@ -10,75 +10,75 @@
{
#region Public Properties
- [Bindable (true), Category ("Appearance"), TypeConverter (typeof (WebColorConverter)),
- Description ("Specifies the color a row is highlighted when the mouse is over it.")]
+ [Bindable(true), Category("Appearance"), TypeConverter(typeof (WebColorConverter)),
+ Description("Specifies the color a row is highlighted when the mouse is over it.")]
public Color RowHighlightColor
{
get
{
- object o = ViewState ["RowHighlightColor"];
+ object o = ViewState["RowHighlightColor"];
if (o == null)
return Color.Empty;
else
return (Color) o;
}
- set { ViewState ["RowHighlightColor"] = value; }
+ set { ViewState["RowHighlightColor"] = value; }
}
- [DefaultValue (""),
- Description ("Specifies the CommandName used in the server-side DataGrid event when the row is clicked.")]
+ [DefaultValue(""),
+ Description("Specifies the CommandName used in the server-side DataGrid event when the row is clicked.")]
public string RowClickEventCommandName
{
get
{
- object o = ViewState ["RowClickEventCommandName"];
+ object o = ViewState["RowClickEventCommandName"];
if (o == null)
return string.Empty;
else
return (string) o;
}
- set { ViewState ["RowClickEventCommandName"] = value; }
+ set { ViewState["RowClickEventCommandName"] = value; }
}
- [DefaultValue (true),
- Description ("Indicates whether or not rows are highlighted/clickable.")]
+ [DefaultValue(true),
+ Description("Indicates whether or not rows are highlighted/clickable.")]
public bool RowSelectionEnabled
{
get
{
- object o = ViewState ["RowSelectionEnabled"];
+ object o = ViewState["RowSelectionEnabled"];
if (o == null)
return true;
else
return (bool) o;
}
- set { ViewState ["RowSelectionEnabled"] = value; }
+ set { ViewState["RowSelectionEnabled"] = value; }
}
#endregion
#region Overridden DataGrid Methods
- protected override DataGridItem CreateItem (int itemIndex, int dataSourceIndex, ListItemType itemType)
+ protected override DataGridItem CreateItem(int itemIndex, int dataSourceIndex, ListItemType itemType)
{
// Create the NexusDataGridItem
- NexusDataGridItem item = new NexusDataGridItem (itemIndex, dataSourceIndex, itemType);
+ NexusDataGridItem item = new NexusDataGridItem(itemIndex, dataSourceIndex, itemType);
// Set the client-side onmouseover and onmouseout if RowSelectionEnabled == true
if (RowSelectionEnabled && itemType != ListItemType.Header && itemType != ListItemType.Footer
&& itemType != ListItemType.Pager)
{
- item.Attributes ["onmouseover"] = "javascript:nexusDG_changeBackColor(this, true);";
- item.Attributes ["onmouseout"] = "javascript:nexusDG_changeBackColor(this, false);";
+ item.Attributes["onmouseover"] = "javascript:nexusDG_changeBackColor(this, true);";
+ item.Attributes["onmouseout"] = "javascript:nexusDG_changeBackColor(this, false);";
}
// return the NexusDataGridItem
return item;
}
- protected override void OnPreRender (EventArgs e)
+ protected override void OnPreRender(EventArgs e)
{
- base.OnPreRender (e);
+ base.OnPreRender(e);
if (!RowSelectionEnabled) return; // exit if not RowSelectionEnabled == true
@@ -103,8 +103,8 @@
// -->
</script>";
- if (RowHighlightColor != Color.Empty && !Page.IsClientScriptBlockRegistered (SCRIPT_KEY))
- Page.RegisterClientScriptBlock (SCRIPT_KEY, SCRIPT);
+ if (RowHighlightColor != Color.Empty && !Page.IsClientScriptBlockRegistered(SCRIPT_KEY))
+ Page.RegisterClientScriptBlock(SCRIPT_KEY, SCRIPT);
}
#endregion
@@ -112,17 +112,17 @@
public class NexusDataGridItem : DataGridItem, IPostBackEventHandler
{
- public NexusDataGridItem (int itemIndex, int dataSetIndex, ListItemType itemType) : base (itemIndex, dataSetIndex, itemType)
+ public NexusDataGridItem(int itemIndex, int dataSetIndex, ListItemType itemType) : base(itemIndex, dataSetIndex, itemType)
{
}
#region IPostBackEventHandler Members
- public void RaisePostBackEvent (string eventArgument)
+ public void RaisePostBackEvent(string eventArgument)
{
- CommandEventArgs commandArgs = new CommandEventArgs (eventArgument, null);
- DataGridCommandEventArgs args = new DataGridCommandEventArgs (this, this, commandArgs);
- base.RaiseBubbleEvent (this, args);
+ CommandEventArgs commandArgs = new CommandEventArgs(eventArgument, null);
+ DataGridCommandEventArgs args = new DataGridCommandEventArgs(this, this, commandArgs);
+ base.RaiseBubbleEvent(this, args);
}
#endregion
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj?rev=265772&r1=265771&r2=265772&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/Web.csproj Thu Sep 1 12:26:36 2005
@@ -3,7 +3,7 @@
ProjectType = "Web"
ProductVersion = "7.10.3077"
SchemaVersion = "2.0"
- ProjectGuid = "{0CEB9BDE-7AA3-4239-8898-EFFB88CDDD93}"
+ ProjectGuid = "{2BD7CDE0-01F7-4CC5-9AE9-2F9470FB7007}"
>
<Build>
<Settings
@@ -29,12 +29,12 @@
CheckForOverflowUnderflow = "false"
ConfigurationOverrideFile = ""
DefineConstants = "DEBUG;TRACE"
- DocumentationFile = "Nexus.Web.xml"
+ DocumentationFile = ""
DebugSymbols = "true"
FileAlignment = "4096"
IncrementalBuild = "false"
NoStdLib = "false"
- NoWarn = "1591"
+ NoWarn = ""
Optimize = "false"
OutputPath = "bin\"
RegisterForComInterop = "false"
@@ -67,37 +67,42 @@
<Reference
Name = "System"
AssemblyName = "System"
- HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll"
/>
<Reference
Name = "System.Drawing"
AssemblyName = "System.Drawing"
- HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
/>
<Reference
Name = "System.Data"
AssemblyName = "System.Data"
- HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
/>
<Reference
Name = "System.Web"
AssemblyName = "System.Web"
- HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Web.dll"
/>
<Reference
Name = "System.XML"
AssemblyName = "System.Xml"
- HintPath = "..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
+ HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
/>
<Reference
- Name = "Nexus.Core"
- AssemblyName = "Nexus.Core"
- HintPath = "..\Core\bin\Debug\Nexus.Core.dll"
+ Name = "Core"
+ Project = "{7C8CAFD4-1E45-41B4-9963-F51199B12EA7}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
/>
<Reference
- Name = "Agility.Core"
- AssemblyName = "Agility.Core"
- HintPath = "..\..\Agility\Core\bin\Debug\Agility.Core.dll"
+ Name = "Extras"
+ Project = "{7931CACD-0E73-4DD2-A373-FF6A01CE6186}"
+ Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+ />
+ <Reference
+ Name = "Spring.Core"
+ AssemblyName = "Spring.Core"
+ HintPath = "..\..\SpringNet.bin\Spring.Core.dll"
/>
<Reference
Name = "Spring.Web"
@@ -105,9 +110,9 @@
HintPath = "..\..\SpringNet.bin\Spring.Web.dll"
/>
<Reference
- Name = "Spring.Core"
- AssemblyName = "Spring.Core"
- HintPath = "..\..\SpringNet.bin\Spring.Core.dll"
+ Name = "Agility.Core"
+ AssemblyName = "Agility.Core"
+ HintPath = "..\..\Agility\Core\bin\Debug\Agility.Core.dll"
/>
</References>
</Build>
@@ -120,7 +125,6 @@
/>
<File
RelPath = "BaseGridPage.aspx"
- SubType = "Form"
BuildAction = "Content"
/>
<File
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org