Author: husted
Date: Tue Sep 13 13:29:08 2005
New Revision: 280644
URL: http://svn.apache.org/viewcvs?rev=280644&view=rev
Log:
OVR-15
* Reformat code only; no changes.
Modified:
struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs
struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/IViewControl.cs
struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs
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=280644&r1=280643&r2=280644&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Core/Helpers/IViewHelper.cs Tue Sep 13
13:29:08 2005
@@ -33,7 +33,6 @@
///
public interface IViewHelper
{
-
/// <summary>
/// Perform the Command associated with this Helper.
/// </summary>
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs?rev=280644&r1=280643&r2=280644&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/GridControl.ascx.cs Tue Sep 13
13:29:08 2005
@@ -401,7 +401,7 @@
// append our field names to the array of keys
for (int i = 0; i < cols; i++)
keys[index++] = DataFields[i] as string;
- ReadGridControls(controls,h.Criteria, keys,
true);
+ ReadGridControls(controls, h.Criteria, keys,
true);
h.Execute();
}
return h;
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/IViewControl.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/IViewControl.cs?rev=280644&r1=280643&r2=280644&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/IViewControl.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/IViewControl.cs Tue Sep 13
13:29:08 2005
@@ -1,4 +1,3 @@
-using System;
using System.Collections;
using System.Web.UI;
using Nexus.Core.Helpers;
@@ -7,14 +6,13 @@
{
public interface IViewControl
{
-
/// <summary>
/// Set Labels and TextBoxes to an empty string
/// to ensure inappropriate values are not carried over.
/// </summary>
///
void ResetControls();
-
+
IViewHelper GetHelperFor(string command);
IViewHelper Execute(string command);
@@ -26,10 +24,10 @@
IViewHelper ExecuteBind(ControlCollection controls, string
command);
IViewHelper ExecuteBind(string command);
-
+
IViewHelper Read(string command, bool nullIfEmpty);
IViewHelper Read(string command);
-
+
IViewHelper ReadExecute(string command, bool nullIfEmpty);
IViewHelper ReadExecute(string command);
@@ -41,4 +39,4 @@
IViewHelper ReadExecute(string command, IDictionary criteria);
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs?rev=280644&r1=280643&r2=280644&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/ViewControl.ascx.cs Tue Sep 13
13:29:08 2005
@@ -13,7 +13,6 @@
/// </summary>
public class ViewControl : UserControl, IViewControl
{
-
private IRequestCatalog _Catalog;
/// <summary>
@@ -266,19 +265,19 @@
public void ExecuteBind(ControlCollection controls, IViewHelper
helper)
{
helper.Execute();
- Bind(controls,helper.Criteria);
+ Bind(controls, helper.Criteria);
}
public IViewHelper ExecuteBind(ControlCollection controls,
string command)
{
IViewHelper helper = GetHelperFor(command);
- ExecuteBind(controls,helper);
+ ExecuteBind(controls, helper);
return helper;
}
public void ExecuteBind(IViewHelper helper)
{
- ExecuteBind(this.Controls,helper);
+ ExecuteBind(this.Controls, helper);
}
public IViewHelper ExecuteBind(string command)
@@ -304,7 +303,8 @@
return trimmed;
}
- private void ReadControls(ControlCollection controls,
IDictionary dictionary, string prefix, string list_suffix, bool nullIfEmpty) {
+ private void ReadControls(ControlCollection controls,
IDictionary dictionary, string prefix, string list_suffix, bool nullIfEmpty)
+ {
foreach (Control t in controls)
{
if (IsTextBox(t))
@@ -346,22 +346,22 @@
public IViewHelper Read(ControlCollection controls, string
command, bool nullIfEmpty)
{
IViewHelper helper = GetHelperFor(command);
-
ReadControls(controls,helper.Criteria,null,ListSuffix,nullIfEmpty);
- return helper;
+ ReadControls(controls, helper.Criteria, null,
ListSuffix, nullIfEmpty);
+ return helper;
}
public IViewHelper Read(string command, bool nullIfEmpty)
{
return Read(this.Controls, command, nullIfEmpty);
}
-
+
public IViewHelper Read(string command)
{
- return Read(this.Controls, command, true);
+ return Read(this.Controls, command, true);
}
public IViewHelper ReadExecute(ControlCollection collection,
string command, bool nullIfEmpty)
- {
+ {
IViewHelper helper = Read(collection, command,
nullIfEmpty);
helper.Execute();
return helper;
@@ -402,6 +402,7 @@
helper.Execute();
return helper;
}
+
#endregion
#region ListControl methods
Modified: struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs?rev=280644&r1=280643&r2=280644&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/Nexus/Web/WebHelper.cs Tue Sep 13 13:29:08
2005
@@ -6,7 +6,6 @@
{
public class WebHelper : ViewHelper
{
-
public override string ErrorsText
{
get { return HtmlMessageBuilder(Alerts); }
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
