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/21 01:13:14 UTC
svn commit: r191584 - in /struts/sandbox/trunk/overdrive/PhoneBook: Core/
Core/Commands/ Test/ Test/Commands/ Test/Forms/ Web/ Web/Forms/
Author: husted
Date: Mon Jun 20 16:13:12 2005
New Revision: 191584
URL: http://svn.apache.org/viewcvs?rev=191584&view=rev
Log:
OVR-15
* Code reformatting only. No changes.
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs Mon Jun 20 16:13:12 2005
@@ -1,4 +1,4 @@
-/*
+ /*
* Copyright 2005 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
namespace PhoneBook.Core
{
/// <summary>
@@ -21,7 +22,7 @@
///
public class App
{
- private App()
+ private App ()
{
// No need to construct static helper class
}
@@ -81,4 +82,4 @@
public const string LIST_LAST_NAMES = "list_last_names";
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs Mon Jun 20 16:13:12 2005
@@ -23,9 +23,8 @@
/// exposed by the application.
/// </summary>
///
- public class AppContext: Hashtable
+ public class AppContext : Hashtable
{
-
#region Constructors
/// <summary>
@@ -92,9 +91,9 @@
}
}
*/
+
#endregion
-
-
+
/*
public string property
{
@@ -105,39 +104,39 @@
public string first_name
{
- get { return this[App.FIRST_NAME] as string; }
- set { this[App.FIRST_NAME] = value; }
+ get { return this [App.FIRST_NAME] as string; }
+ set { this [App.FIRST_NAME] = value; }
}
public string last_name
{
- get { return this[App.LAST_NAME] as string; }
- set { this[App.LAST_NAME] = value; }
+ get { return this [App.LAST_NAME] as string; }
+ set { this [App.LAST_NAME] = value; }
}
public string extension
{
- get { return this[App.EXTENSION] as string; }
- set { this[App.EXTENSION] = value; }
+ get { return this [App.EXTENSION] as string; }
+ set { this [App.EXTENSION] = value; }
}
public string user_name
{
- get { return this[App.USER_NAME] as string; }
- set { this[App.USER_NAME] = value; }
+ get { return this [App.USER_NAME] as string; }
+ set { this [App.USER_NAME] = value; }
}
public string hired
{
- get { return this[App.HIRED] as string; }
- set { this[App.HIRED] = value; }
+ get { return this [App.HIRED] as string; }
+ set { this [App.HIRED] = value; }
}
public string hours
{
- get { return this[App.HOURS] as string; }
- set { this[App.HOURS] = value; }
+ get { return this [App.HOURS] as string; }
+ set { this [App.HOURS] = value; }
}
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs Mon Jun 20 16:13:12 2005
@@ -1,19 +1,17 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
-
//
// General Information about an assembly is controlled through the following
// 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:
@@ -26,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
@@ -53,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("")]
+[assembly : AssemblyDelaySign (false)]
+[assembly : AssemblyKeyFile ("")]
+[assembly : AssemblyKeyName ("")]
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs Mon Jun 20 16:13:12 2005
@@ -27,7 +27,7 @@
public SqlMapper Mapper ()
{
// return IBatisNet.DataMapper.Mapper.Instance();
- return IBatisNet.DataMapper.Mapper.Instance();
+ return IBatisNet.DataMapper.Mapper.Instance ();
}
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs Mon Jun 20 16:13:12 2005
@@ -1,19 +1,17 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
-
//
// General Information about an assembly is controlled through the following
// 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:
@@ -26,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
@@ -53,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("")]
+[assembly : AssemblyDelaySign (false)]
+[assembly : AssemblyKeyFile ("")]
+[assembly : AssemblyKeyName ("")]
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs Mon Jun 20 16:13:12 2005
@@ -27,20 +27,19 @@
[TestFixture]
public class BaseTest : BaseNexusTest
{
-
/// <summary>
/// Confirm that the outcome is a non-null, non-empty list.
/// </summary>
/// <param name="context">Context to confirm</param>
/// <returns>The non-null, non-empty list</returns>
///
- protected IList AssertListOutcome(IRequestContext context)
+ protected IList AssertListOutcome (IRequestContext context)
{
- AssertNominal(context);
- Assert.IsTrue (context.HasOutcome,"Expected command to set an Outcome.");
+ AssertNominal (context);
+ Assert.IsTrue (context.HasOutcome, "Expected command to set an Outcome.");
IList list = context.Outcome as IList;
- bool notEmpty = ((list!=null) && (list.Count>0));
- Assert.IsTrue (notEmpty,"Expected outcome to be a not-empty list");
+ bool notEmpty = ((list != null) && (list.Count > 0));
+ Assert.IsTrue (notEmpty, "Expected outcome to be a not-empty list");
return list;
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs Mon Jun 20 16:13:12 2005
@@ -27,26 +27,25 @@
[TestFixture]
public class FilterLists : BaseTest
{
-
/// <summary>
/// Confirm that a list is returned as the outcome,
/// and that each item on the list is not-empty and unique.
/// </summary>
/// <param name="context">Context returned by command</param>
///
- private void FilterList_Result(IRequestContext context)
+ private void FilterList_Result (IRequestContext context)
{
- IList list = AssertListOutcome(context);
+ IList list = AssertListOutcome (context);
foreach (string key in list)
{
- Assert.IsNotNull (key,"Expected each item to be non-null");
- Assert.IsTrue (key.Length>0,"Expected each item to be non-empty");
+ Assert.IsNotNull (key, "Expected each item to be non-null");
+ Assert.IsTrue (key.Length > 0, "Expected each item to be non-empty");
}
- IDictionary keys = new Hashtable(list.Count);
+ IDictionary keys = new Hashtable (list.Count);
foreach (string key in list)
{
if (keys.Contains (key)) Assert.Fail (key + ": Expected each item to be unique");
- keys.Add (key,key);
+ keys.Add (key, key);
}
}
@@ -55,11 +54,11 @@
/// </summary>
///
[Test]
- public void TestLastNameFilterList()
+ public void TestLastNameFilterList ()
{
IRequestContext context = catalog.ExecuteRequest (App.LIST_LAST_NAMES);
- FilterList_Result(context);
+ FilterList_Result (context);
}
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs Mon Jun 20 16:13:12 2005
@@ -26,23 +26,22 @@
[TestFixture]
public class SelectAllTest : BaseTest
{
-
/// <summary>
/// Assert result of SelectAll, after another method runs the command.
/// </summary>
/// <param name="context">Context with result to assert.</param>
///
- private void SelectAll_Result(IRequestContext context)
+ private void SelectAll_Result (IRequestContext context)
{
- IList list = AssertListOutcome(context);
- IDictionary row = list[0] as IDictionary;
+ IList list = AssertListOutcome (context);
+ IDictionary row = list [0] as IDictionary;
string[] KEYS = {App.FIRST_NAME, App.LAST_NAME, App.USER_NAME, App.EXTENSION, App.HIRED, App.HOURS, App.EDITOR};
bool valid = true;
foreach (string key in KEYS)
{
valid = valid && row.Contains (key);
}
- Assert.IsTrue (valid,"Expected row to contain all keys.");
+ Assert.IsTrue (valid, "Expected row to contain all keys.");
}
/// <summary>
@@ -52,11 +51,11 @@
[Test]
public void SelectAll_Pass_Without_Catalog ()
{
- BaseList command = new BaseList();
+ BaseList command = new BaseList ();
command.ID = App.SELECT_ALL;
IRequestContext context = command.NewContext ();
- command.Execute(context);
- SelectAll_Result(context);
+ command.Execute (context);
+ SelectAll_Result (context);
}
/// <summary>
@@ -67,7 +66,7 @@
public void SelectAll_Pass ()
{
IRequestContext context = catalog.ExecuteRequest (App.SELECT_ALL);
- SelectAll_Result(context);
+ SelectAll_Result (context);
}
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs Mon Jun 20 16:13:12 2005
@@ -19,28 +19,26 @@
namespace WNE.Core.Forms
{
-
/// <summary>
/// Exercise the Directory page controls.
/// </summary>
[TestFixture]
public class DirectoryTest : WebFormTestCase
{
-
- PanelTester pnlFind;
- DropDownListTester lstLastName;
- DropDownListTester lstFirstName;
- DropDownListTester lstExtension;
- DropDownListTester lstUserName;
- DropDownListTester lstHireDate;
- DropDownListTester lstHours;
- DropDownListTester lstEditor;
- ButtonTester cmdListAll;
- ButtonTester cmdPrint;
-
- PanelTester pnlList;
- DataGridTester repList;
- ButtonTester cmdAdd;
+ private PanelTester pnlFind;
+ private DropDownListTester lstLastName;
+ private DropDownListTester lstFirstName;
+ private DropDownListTester lstExtension;
+ private DropDownListTester lstUserName;
+ private DropDownListTester lstHireDate;
+ private DropDownListTester lstHours;
+ private DropDownListTester lstEditor;
+ private ButtonTester cmdListAll;
+ private ButtonTester cmdPrint;
+
+ private PanelTester pnlList;
+ private DataGridTester repList;
+ private ButtonTester cmdAdd;
/// <summary>
/// Provide an array of the DropDownListTesters.
@@ -49,7 +47,7 @@
///
private DropDownListTester[] GetLists ()
{
- DropDownListTester[] lists = {lstLastName,lstFirstName,lstExtension,lstUserName,lstHireDate,lstHours,lstEditor};
+ DropDownListTester[] lists = {lstLastName, lstFirstName, lstExtension, lstUserName, lstHireDate, lstHours, lstEditor};
return lists;
}
@@ -60,21 +58,21 @@
protected override void SetUp ()
{
base.SetUp ();
-
- pnlFind = new PanelTester("pnlFind", CurrentWebForm);
- lstLastName = new DropDownListTester("lstLastName",CurrentWebForm);
- lstFirstName = new DropDownListTester("lstFirstName",CurrentWebForm);
- lstExtension = new DropDownListTester("lstExtension",CurrentWebForm);
- lstUserName = new DropDownListTester("lstUserName",CurrentWebForm);
- lstHireDate = new DropDownListTester("lstHireDate",CurrentWebForm);
- lstHours = new DropDownListTester("lstHours",CurrentWebForm);
- lstEditor = new DropDownListTester("lstEditor",CurrentWebForm);
- cmdListAll = new ButtonTester("cmdListAll",CurrentWebForm);
- cmdPrint = new ButtonTester("cmdPrint",CurrentWebForm);
-
- pnlList = new PanelTester("pnlList",CurrentWebForm);
- repList = new DataGridTester("repList",CurrentWebForm);
- cmdAdd = new ButtonTester("cmdAdd",CurrentWebForm);
+
+ pnlFind = new PanelTester ("pnlFind", CurrentWebForm);
+ lstLastName = new DropDownListTester ("lstLastName", CurrentWebForm);
+ lstFirstName = new DropDownListTester ("lstFirstName", CurrentWebForm);
+ lstExtension = new DropDownListTester ("lstExtension", CurrentWebForm);
+ lstUserName = new DropDownListTester ("lstUserName", CurrentWebForm);
+ lstHireDate = new DropDownListTester ("lstHireDate", CurrentWebForm);
+ lstHours = new DropDownListTester ("lstHours", CurrentWebForm);
+ lstEditor = new DropDownListTester ("lstEditor", CurrentWebForm);
+ cmdListAll = new ButtonTester ("cmdListAll", CurrentWebForm);
+ cmdPrint = new ButtonTester ("cmdPrint", CurrentWebForm);
+
+ pnlList = new PanelTester ("pnlList", CurrentWebForm);
+ repList = new DataGridTester ("repList", CurrentWebForm);
+ cmdAdd = new ButtonTester ("cmdAdd", CurrentWebForm);
Browser.GetPage ("http://localhost/PhoneBook/Forms/Directory.aspx");
}
@@ -85,18 +83,18 @@
/// </summary>
///
[Test]
- public void FindControls()
+ public void FindControls ()
{
- WebAssert.Visible(pnlFind);
- foreach (DropDownListTester list in GetLists())
+ WebAssert.Visible (pnlFind);
+ foreach (DropDownListTester list in GetLists ())
{
WebAssert.Visible (list);
}
- WebAssert.Visible(cmdListAll);
- WebAssert.Visible(cmdPrint);
- WebAssert.Visible(pnlList);
- WebAssert.Visible(repList);
- WebAssert.NotVisible (cmdAdd);// Visible if Editor
+ WebAssert.Visible (cmdListAll);
+ WebAssert.Visible (cmdPrint);
+ WebAssert.Visible (pnlList);
+ WebAssert.Visible (repList);
+ WebAssert.NotVisible (cmdAdd); // Visible if Editor
}
/// <summary>
@@ -104,12 +102,12 @@
/// </summary>
///
[Test]
- public void ListControls()
+ public void ListControls ()
{
- foreach (DropDownListTester list in GetLists())
+ foreach (DropDownListTester list in GetLists ())
{
- Assert.IsTrue(list.Items.Count >0,list.HtmlId + ": Expected all filter lists to have items.");
- }
+ Assert.IsTrue (list.Items.Count > 0, list.HtmlId + ": Expected all filter lists to have items.");
+ }
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs Mon Jun 20 16:13:12 2005
@@ -1,19 +1,17 @@
using System.Reflection;
-using System.Runtime.CompilerServices;
-
//
// General Information about an assembly is controlled through the following
// 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:
@@ -26,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
@@ -57,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("")]
+[assembly : AssemblyDelaySign (false)]
+[assembly : AssemblyKeyFile ("")]
+[assembly : AssemblyKeyName ("")]
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs Mon Jun 20 16:13:12 2005
@@ -8,14 +8,12 @@
namespace PhoneBook.Web.Forms
{
-
/// <summary>
/// Maintain a list of employees with their telephone extension [OVR-5].
/// </summary>
///
public class Directory : Page
{
-
#region Messages
private const string msg_ADD_CMD = "ADD NEW";
@@ -26,15 +24,14 @@
public IList GetDataSource ()
{
- BaseList command = new BaseList();
+ BaseList command = new BaseList ();
command.ID = App.SELECT_ALL;
IRequestContext context = command.NewContext ();
- command.Execute(context);
+ command.Execute (context);
IList result = context.Outcome as IList;
return result;
}
-
#region Find
protected Panel pnlFind;
@@ -52,7 +49,7 @@
private DropDownList[] GetLists ()
{
- DropDownList[] lists = {lstLastName,lstFirstName,lstExtension,lstUserName,lstHireDate,lstHours,lstEditor};
+ DropDownList[] lists = {lstLastName, lstFirstName, lstExtension, lstUserName, lstHireDate, lstHours, lstEditor};
return lists;
}
@@ -61,9 +58,9 @@
cmdListAll.Text = msg_LIST_ALL_CMD;
cmdPrint.Text = msg_PRINT_CMD;
- foreach (DropDownList filter in GetLists())
+ foreach (DropDownList filter in GetLists ())
{
- filter.AutoPostBack = true;
+ filter.AutoPostBack = true;
}
}
@@ -83,7 +80,7 @@
protected Panel pnlList;
protected DataGrid repList;
protected Button cmdAdd;
-
+
// pageload events
private void List_Init ()
@@ -94,7 +91,7 @@
private void List_Load ()
{
- repList.DataSource = GetDataSource();
+ repList.DataSource = GetDataSource ();
repList.DataBind ();
}
@@ -117,28 +114,26 @@
protected void List_PageIndexChanged (object sender, DataGridPageChangedEventArgs e)
{
- Find_Filter(null,null);
+ Find_Filter (null, null);
repList.CurrentPageIndex = e.NewPageIndex;
- repList.DataBind ();
+ repList.DataBind ();
}
#endregion
- protected void Page_Init()
+ protected void Page_Init ()
{
- Find_Init();
- List_Init();
+ Find_Init ();
+ List_Init ();
}
- protected void Page_Load(object sender, System.EventArgs e)
+ protected void Page_Load (object sender, EventArgs e)
{
- if (IsPostBack)
- {
- Find_Filter(sender, e);
- }
+ if (IsPostBack)
+ Find_Filter (sender, e);
{
- List_Load();
+ List_Load ();
}
}
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs?rev=191584&r1=191583&r2=191584&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs Mon Jun 20 16:13:12 2005
@@ -1,76 +1,67 @@
using System;
-using System.Collections;
using System.ComponentModel;
using System.Web;
-using System.Web.SessionState;
-namespace PhoneBook
+namespace PhoneBook
{
/// <summary>
/// Summary description for Global.
/// </summary>
- public class Global : System.Web.HttpApplication
+ public class Global : HttpApplication
{
/// <summary>
/// Required designer variable.
/// </summary>
- private System.ComponentModel.IContainer components = null;
+ private IContainer components = null;
- public Global()
+ public Global ()
{
- InitializeComponent();
- }
-
- protected void Application_Start(Object sender, EventArgs e)
- {
-
+ InitializeComponent ();
}
-
- protected void Session_Start(Object sender, EventArgs e)
- {
+ protected void Application_Start (Object sender, EventArgs e)
+ {
}
- protected void Application_BeginRequest(Object sender, EventArgs e)
+ protected void Session_Start (Object sender, EventArgs e)
{
-
}
- protected void Application_EndRequest(Object sender, EventArgs e)
+ protected void Application_BeginRequest (Object sender, EventArgs e)
{
-
}
- protected void Application_AuthenticateRequest(Object sender, EventArgs e)
+ protected void Application_EndRequest (Object sender, EventArgs e)
{
-
}
- protected void Application_Error(Object sender, EventArgs e)
+ protected void Application_AuthenticateRequest (Object sender, EventArgs e)
{
-
}
- protected void Session_End(Object sender, EventArgs e)
+ protected void Application_Error (Object sender, EventArgs e)
{
-
}
- protected void Application_End(Object sender, EventArgs e)
+ protected void Session_End (Object sender, EventArgs e)
{
+ }
+ protected void Application_End (Object sender, EventArgs e)
+ {
}
-
+
#region Web Form Designer generated code
+
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
- private void InitializeComponent()
- {
- this.components = new System.ComponentModel.Container();
+ private void InitializeComponent ()
+ {
+ this.components = new Container ();
}
+
#endregion
}
-}
-
+}
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org