Author: husted
Date: Sat Sep 10 12:20:36 2005
New Revision: 280032
URL: http://svn.apache.org/viewcvs?rev=280032&view=rev
Log:
OVR-15
* Code reformating only. No changes.
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntry.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryListProcessor.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppUserProfile.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseEntry.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseFilterList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseSave.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/DirectoryViewTest.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/AppGridHelper.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.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=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs Sat Sep 10 12:20:36
2005
@@ -22,7 +22,7 @@
///
public class App
{
- private App ()
+ private App()
{
// No need to construct static helper class
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntry.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntry.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntry.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntry.cs Sat Sep 10
12:20:36 2005
@@ -23,21 +23,21 @@
///
public class AppEntry
{
- public void Add (string key, string value)
+ public void Add(string key, string value)
{
- _Value.Add (key, value);
+ _Value.Add(key, value);
}
- private IDictionary _Value = new Hashtable (5);
+ private IDictionary _Value = new Hashtable(5);
- private string Get (string key)
+ private string Get(string key)
{
- return _Value [key] as string;
+ return _Value[key] as string;
}
- private void Set (string key, string value)
+ private void Set(string key, string value)
{
- _Value [key] = value;
+ _Value[key] = value;
}
@@ -51,50 +51,50 @@
public string entry_key
{
- get { return Get (App.ENTRY_KEY); }
- set { Set (App.ENTRY_KEY, value); }
+ get { return Get(App.ENTRY_KEY); }
+ set { Set(App.ENTRY_KEY, value); }
}
public string first_name
{
- get { return Get (App.FIRST_NAME); }
- set { Set (App.FIRST_NAME, value); }
+ get { return Get(App.FIRST_NAME); }
+ set { Set(App.FIRST_NAME, value); }
}
public string last_name
{
- get { return Get (App.LAST_NAME); }
- set { Set (App.LAST_NAME, value); }
+ get { return Get(App.LAST_NAME); }
+ set { Set(App.LAST_NAME, value); }
}
public string extension
{
- get { return Get (App.EXTENSION); }
- set { Set (App.EXTENSION, value); }
+ get { return Get(App.EXTENSION); }
+ set { Set(App.EXTENSION, value); }
}
public string user_name
{
- get { return Get (App.USER_NAME); }
- set { Set (App.USER_NAME, value); }
+ get { return Get(App.USER_NAME); }
+ set { Set(App.USER_NAME, value); }
}
public string hired
{
- get { return Get (App.HIRED); }
- set { Set (App.HIRED, value); }
+ get { return Get(App.HIRED); }
+ set { Set(App.HIRED, value); }
}
public string hours
{
- get { return Get (App.HOURS); }
- set { Set (App.HOURS, value); }
+ get { return Get(App.HOURS); }
+ set { Set(App.HOURS, value); }
}
public string editor
{
- get { return Get (App.EDITOR); }
- set { Set (App.EDITOR, value); }
+ get { return Get(App.EDITOR); }
+ set { Set(App.EDITOR, value); }
}
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryList.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryList.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryList.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryList.cs Sat Sep 10
12:20:36 2005
@@ -9,20 +9,20 @@
///
public class AppEntryList : ArrayList, IEntryList
{
- public object Insert (string key)
+ public object Insert(string key)
{
- AppEntry entry = new AppEntry ();
+ AppEntry entry = new AppEntry();
entry.entry_key = key;
- this.Insert (0, entry);
+ this.Insert(0, entry);
return entry;
}
- public void AddEntry (IDictionary row)
+ public void AddEntry(IDictionary row)
{
- AppEntry entry = new AppEntry ();
+ AppEntry entry = new AppEntry();
foreach (DictionaryEntry col in row)
- entry.Add (col.Key.ToString (),
col.Value.ToString ());
- Add (entry);
+ entry.Add(col.Key.ToString(),
col.Value.ToString());
+ Add(entry);
}
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryListProcessor.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryListProcessor.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryListProcessor.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryListProcessor.cs Sat
Sep 10 12:20:36 2005
@@ -5,9 +5,9 @@
{
public class AppEntryListProcessor : EntryListProcessor
{
- public override IEntryList NewEntryList ()
+ public override IEntryList NewEntryList()
{
- return new AppEntryList ();
+ return new AppEntryList();
}
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppUserProfile.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppUserProfile.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppUserProfile.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppUserProfile.cs Sat Sep 10
12:20:36 2005
@@ -9,6 +9,7 @@
public class AppUserProfile : UserProfile
{
private bool _IsEditor = false;
+
public bool IsEditor
{
get { return _IsEditor; }
@@ -19,9 +20,9 @@
/// Instantiate from an IIdentity.
/// </summary>
/// <param name="id">Identity to copy for this profile.</param>
- public AppUserProfile (IIdentity id)
+ public AppUserProfile(IIdentity id)
{
- Principal = new UserPrincipal (id);
+ Principal = new UserPrincipal(id);
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AssemblyInfo.cs Sat Sep 10
12:20: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/PhoneBook/Core/Commands/AppCommand.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/AppCommand.cs Sat
Sep 10 12:20:36 2005
@@ -25,21 +25,21 @@
///
public abstract class AppCommand : RequestCommand
{
- public SqlMapper Mapper ()
+ public SqlMapper Mapper()
{
// return IBatisNet.DataMapper.Mapper.Instance();
- return IBatisNet.DataMapper.Mapper.Instance ();
+ return IBatisNet.DataMapper.Mapper.Instance();
}
- public bool IsEmpty (string input)
+ public bool IsEmpty(string input)
{
- return ((input == null) || (input.Equals
(String.Empty)));
+ return ((input == null) ||
(input.Equals(String.Empty)));
}
- public string GuidString ()
+ public string GuidString()
{
- Guid guid = Guid.NewGuid ();
- string gs = guid.ToString ();
+ Guid guid = Guid.NewGuid();
+ string gs = guid.ToString();
return gs;
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseEntry.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseEntry.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseEntry.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseEntry.cs Sat Sep
10 12:20:36 2005
@@ -25,14 +25,14 @@
///
public class BaseEntry : AppCommand
{
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- object o = Mapper ().QueryForObject (QueryID, context);
- context [ID] = o;
+ object o = Mapper().QueryForObject(QueryID, context);
+ context[ID] = o;
IDictionary entry = o as IDictionary;
foreach (DictionaryEntry e in entry)
{
- context [e.Key] = e.Value;
+ context[e.Key] = e.Value;
}
return CONTINUE;
}
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseFilterList.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseFilterList.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseFilterList.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseFilterList.cs
Sat Sep 10 12:20:36 2005
@@ -26,15 +26,15 @@
///
public class BaseFilterList : AppCommand
{
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- IList rows = Mapper ().QueryForList (QueryID, null);
- IKeyValueList list = new KeyValueList ();
+ IList rows = Mapper().QueryForList(QueryID, null);
+ IKeyValueList list = new KeyValueList();
foreach (object key in rows)
{
- list.Add (new KeyValue (key.ToString (), key));
+ list.Add(new KeyValue(key.ToString(), key));
}
- context [ID] = list;
+ context[ID] = list;
return CONTINUE;
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseList.cs Sat Sep
10 12:20:36 2005
@@ -26,10 +26,10 @@
///
public class BaseList : AppCommand
{
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- IList rows = Mapper ().QueryForList (QueryID, context);
- context [ID] = rows;
+ IList rows = Mapper().QueryForList(QueryID, context);
+ context[ID] = rows;
return CONTINUE;
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseSave.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseSave.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseSave.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Commands/BaseSave.cs Sat Sep
10 12:20:36 2005
@@ -8,6 +8,7 @@
public class BaseSave : AppCommand
{
private string _KeyID = null;
+
/// <summary>
/// The name of the key field.
/// </summary>
@@ -18,6 +19,7 @@
}
private string _InsertID = null;
+
/// <summary>
/// The name of the "insert" mapping for the Entity.
/// </summary>
@@ -28,6 +30,7 @@
}
private string _UpdateID = null;
+
/// <summary>
/// The name of the "update" mapping for the Entity.
/// </summary>
@@ -46,24 +49,24 @@
/// <param name="insertID">The name of the "insert" mapping for
the Entity.</param>
/// <param name="updateID">The name of the "update" mapping for
the Entity.</param>
/// <returns>False</returns>
- protected bool Save (IRequestContext context, string fieldID,
string insertID, string updateID)
+ protected bool Save(IRequestContext context, string fieldID,
string insertID, string updateID)
{
- bool insert = IsEmpty (context [fieldID] as string);
+ bool insert = IsEmpty(context[fieldID] as string);
if (insert)
{
- context [fieldID] = GuidString ();
- Mapper ().Insert (insertID, context);
+ context[fieldID] = GuidString();
+ Mapper().Insert(insertID, context);
}
else
- Mapper ().Update (updateID, context);
+ Mapper().Update(updateID, context);
return CONTINUE;
}
- public override bool RequestExecute (IRequestContext context)
+ public override bool RequestExecute(IRequestContext context)
{
- return Save (context, KeyID, InsertID, UpdateID);
+ return Save(context, KeyID, InsertID, UpdateID);
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs Sat Sep
10 12:20:36 2005
@@ -8,23 +8,23 @@
/// </summary>
public class TelephoneProcessor : Processor
{
- public override bool ConvertInput (IProcessorContext incoming)
+ public override bool ConvertInput(IProcessorContext incoming)
{
string source = incoming.Source as string;
if (source == null) return false;
char[] marks = {'-'};
- string[] splits = source.Split (marks);
- StringBuilder sb = new StringBuilder (source.Length);
+ string[] splits = source.Split(marks);
+ StringBuilder sb = new StringBuilder(source.Length);
foreach (string s in splits)
{
- sb.Append (s);
+ sb.Append(s);
}
- incoming.Target = sb.ToString ();
+ incoming.Target = sb.ToString();
return true;
}
- public override bool FormatOutput (IProcessorContext outgoing)
+ public override bool FormatOutput(IProcessorContext outgoing)
{
string mark = "-";
string source = outgoing.Source as string;
@@ -34,13 +34,13 @@
if (source.Length == 10)
{
// 012-345-6789
- string buffer1 = source.Insert (6, mark);
- buffer = buffer1.Insert (3, mark);
+ string buffer1 = source.Insert(6, mark);
+ buffer = buffer1.Insert(3, mark);
}
else if (source.Length == 7)
{
// 012-3456
- buffer = source.Insert (3, mark);
+ buffer = source.Insert(3, mark);
}
else buffer = source;
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/AssemblyInfo.cs Sat Sep 10
12:20: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/PhoneBook/Test/BaseTest.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs Sat Sep 10
12:20:36 2005
@@ -33,13 +33,13 @@
/// <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");
+ Assert.IsTrue(notEmpty, "Expected outcome to be a
not-empty list");
return list;
}
@@ -48,7 +48,7 @@
/// </summary>
///
[Test]
- public void Pass ()
+ public void Pass()
{
}
@@ -57,15 +57,15 @@
/// </summary>
///
[Test]
- public void GuidString ()
+ public void GuidString()
{
- IDictionary test = new Hashtable ();
+ IDictionary test = new Hashtable();
for (int i = 0; i < 10; i++)
{
- string key = Guid.NewGuid ().ToString ();
- Assert.IsNotNull (key);
- Assert.IsTrue (36 == key.Length);
- test.Add (key, key); // Add throws an exception
on duplicate keys
+ string key = Guid.NewGuid().ToString();
+ Assert.IsNotNull(key);
+ Assert.IsTrue(36 == key.Length);
+ test.Add(key, key); // Add throws an exception
on duplicate keys
}
}
}
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/DirectoryViewTest.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/DirectoryViewTest.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/DirectoryViewTest.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/DirectoryViewTest.cs
Sat Sep 10 12:20:36 2005
@@ -11,20 +11,19 @@
[TestFixture]
public class DirectoryViewTest : BaseTest
{
-
/// <summary>
/// Confirm that Context contains the expected attributes for
the list filter-0ps.
/// </summary>
///
[Test]
- public void ContainsFilters ()
+ public void ContainsFilters()
{
- IRequestContext context = catalog.ExecuteRequest
(App.DIRECTORY_VIEW);
+ IRequestContext context =
catalog.ExecuteRequest(App.DIRECTORY_VIEW);
this.AssertNominal(context);
string[] FILTERS = {App.LAST_NAME_LIST,
App.FIRST_NAME_LIST, App.EXTENSION_LIST, App.USER_NAME_LIST, App.HIRED_LIST,
App.HOURS_LIST};
foreach (string filter in FILTERS)
{
- Assert.IsTrue (context.Contains (filter),
filter + ": Expected context to contain key.");
+ Assert.IsTrue(context.Contains(filter), filter
+ ": Expected context to contain key.");
}
}
@@ -32,12 +31,12 @@
/// Confirm that Helper contains the expected command.
/// </summary>
[Test]
- public void HelperContains ()
+ public void HelperContains()
{
- IViewHelper helper = catalog.GetHelperFor
(App.DIRECTORY_VIEW);
+ IViewHelper helper =
catalog.GetHelperFor(App.DIRECTORY_VIEW);
IRequestCommand command = helper.Command;
- Assert.IsNotNull (command, "Expected Helper to have a
Command");
- Assert.AreEqual (App.DIRECTORY_VIEW, command.ID,
"Expected Helper to have View Command.");
+ Assert.IsNotNull(command, "Expected Helper to have a
Command");
+ Assert.AreEqual(App.DIRECTORY_VIEW, command.ID,
"Expected Helper to have View Command.");
}
}
}
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=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/FilterLists.cs Sat
Sep 10 12:20:36 2005
@@ -34,23 +34,23 @@
/// </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 (IKeyValue item in list)
{
- Assert.IsNotNull (item, "Expected each item to
be non-null");
+ Assert.IsNotNull(item, "Expected each item to
be non-null");
object key = item.Value;
- Assert.IsNotNull (key, "Expected each key to be
non-null");
- string keystring = key.ToString ();
- Assert.IsTrue (keystring.Length > 0, "Expected
each key to be non-empty");
+ Assert.IsNotNull(key, "Expected each key to be
non-null");
+ string keystring = key.ToString();
+ Assert.IsTrue(keystring.Length > 0, "Expected
each key to be non-empty");
}
- IDictionary keys = new Hashtable (list.Count);
+ IDictionary keys = new Hashtable(list.Count);
foreach (IKeyValue item in list)
{
- string key = item.Value.ToString ();
- if (keys.Contains (key)) Assert.Fail (key + ":
Expected each item to be unique");
- keys.Add (key, key);
+ string key = item.Value.ToString();
+ if (keys.Contains(key)) Assert.Fail(key + ":
Expected each item to be unique");
+ keys.Add(key, key);
}
}
@@ -59,45 +59,45 @@
/// </summary>
///
[Test]
- public void TestFilterLists ()
+ public void TestFilterLists()
{
string[] FILTERS = {App.LAST_NAME_LIST,
App.FIRST_NAME_LIST, App.EXTENSION_LIST, App.USER_NAME_LIST, App.HIRED_LIST,
App.HOURS_LIST};
foreach (string filter in FILTERS)
{
- IRequestContext context =
catalog.ExecuteRequest (filter);
- FilterList_Result (context);
+ IRequestContext context =
catalog.ExecuteRequest(filter);
+ FilterList_Result(context);
}
}
- private IKeyValueList FilterList (string key)
+ private IKeyValueList FilterList(string key)
{
- IViewHelper helper = catalog.GetHelperFor
(App.DIRECTORY_VIEW);
- helper.Execute ();
- IKeyValueList list = helper.Criteria [key] as
IKeyValueList;
- Assert.IsNotNull (list, "Expected KeyValueList");
+ IViewHelper helper =
catalog.GetHelperFor(App.DIRECTORY_VIEW);
+ helper.Execute();
+ IKeyValueList list = helper.Criteria[key] as
IKeyValueList;
+ Assert.IsNotNull(list, "Expected KeyValueList");
return list;
}
[Test]
- public void TestFilterFormat_extension ()
+ public void TestFilterFormat_extension()
{
- IKeyValueList list = FilterList (App.EXTENSION_LIST);
+ IKeyValueList list = FilterList(App.EXTENSION_LIST);
foreach (IKeyValue item in list)
{
string key = item.Value as string;
- Assert.IsTrue (key.Length >
"1234567890".Length, "Expected formatted extension, not: " + key);
+ Assert.IsTrue(key.Length > "1234567890".Length,
"Expected formatted extension, not: " + key);
}
}
[Test]
- public void TestFilterFormat_hired ()
+ public void TestFilterFormat_hired()
{
- IKeyValueList list = FilterList (App.HIRED_LIST);
+ IKeyValueList list = FilterList(App.HIRED_LIST);
foreach (IKeyValue item in list)
{
string key = item.Value as string;
bool okay = (key.Length > 0) && (key.Length <
"##/##/#### ".Length);
- Assert.IsTrue (okay, "Expected short date
format, not: " + key);
+ Assert.IsTrue(okay, "Expected short date
format, not: " + key);
}
}
}
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=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs Sat
Sep 10 12:20:36 2005
@@ -27,24 +27,23 @@
[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;
- Assert.IsNotNull (row, "Expected list entry to be an
IDictionary.");
+ IList list = AssertListOutcome(context);
+ IDictionary row = list[0] as IDictionary;
+ Assert.IsNotNull(row, "Expected list entry to be an
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);
+ valid = valid && row.Contains(key);
}
- Assert.IsTrue (valid, "Expected row to contain all
keys.");
+ Assert.IsTrue(valid, "Expected row to contain all
keys.");
}
@@ -53,30 +52,30 @@
/// </summary>
///
[Test]
- public void SelectAll_Pass ()
+ public void SelectAll_Pass()
{
- IRequestContext context = catalog.ExecuteRequest
(App.ENTRY_LIST);
- SelectAll_Result (context);
+ IRequestContext context =
catalog.ExecuteRequest(App.ENTRY_LIST);
+ SelectAll_Result(context);
}
[Test]
- public void FilterHelper_Format ()
+ public void FilterHelper_Format()
{
- IViewHelper helper = catalog.GetHelperFor
(App.ENTRY_LIST);
- helper.Execute ();
+ IViewHelper helper =
catalog.GetHelperFor(App.ENTRY_LIST);
+ helper.Execute();
AssertNominal(helper);
AppEntryList list = helper.Outcome as AppEntryList;
- Assert.IsNotNull (list, "Expected list to be
AppEntryList");
- AppEntry row = list [0] as AppEntry;
- Assert.IsNotNull (row, "Expected rows to be
AppEntries");
+ Assert.IsNotNull(list, "Expected list to be
AppEntryList");
+ AppEntry row = list[0] as AppEntry;
+ Assert.IsNotNull(row, "Expected rows to be AppEntries");
string hired = row.hired;
- Assert.IsNotNull (hired, "Expected each row to have a
hired date.");
- Assert.IsTrue (hired.Length < "##/##/#### ".Length,
hired + ": Expected short date format.");
+ Assert.IsNotNull(hired, "Expected each row to have a
hired date.");
+ Assert.IsTrue(hired.Length < "##/##/#### ".Length,
hired + ": Expected short date format.");
string extension = row.extension;
- Assert.IsNotNull (extension, "Expected each row to have
an extension.");
- Assert.IsTrue (extension.Length > "1234567890".Length,
extension + ": Expected formatted extension.");
+ Assert.IsNotNull(extension, "Expected each row to have
an extension.");
+ Assert.IsTrue(extension.Length > "1234567890".Length,
extension + ": Expected formatted extension.");
}
}
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=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Forms/DirectoryTest.cs Sat
Sep 10 12:20:36 2005
@@ -46,7 +46,7 @@
/// </summary>
/// <returns>An array of the DropDownListTesters</returns>
///
- private DropDownListTester[] GetLists ()
+ private DropDownListTester[] GetLists()
{
DropDownListTester[] lists = {last_name_list,
first_name_list, extension_list, user_name_list, hired_list, hours_list};
return lists;
@@ -56,28 +56,28 @@
/// Instantiate the control testers.
/// </summary>
///
- protected override void SetUp ()
+ protected override void SetUp()
{
- base.SetUp ();
+ base.SetUp();
string[] userLanguages = {"en-us"};
Browser.UserLanguages = userLanguages;
Browser.Credentials =
CredentialCache.DefaultCredentials;
- pnlFind = new PanelTester ("pnlFind", CurrentWebForm);
- last_name_list = new DropDownListTester
(App.LAST_NAME_LIST, CurrentWebForm);
- first_name_list = new DropDownListTester
(App.FIRST_NAME_LIST, CurrentWebForm);
- extension_list = new DropDownListTester
(App.EXTENSION_LIST, CurrentWebForm);
- user_name_list = new DropDownListTester
(App.USER_NAME_LIST, CurrentWebForm);
- hired_list = new DropDownListTester (App.HIRED_LIST,
CurrentWebForm);
- hours_list = new DropDownListTester (App.HOURS_LIST,
CurrentWebForm);
+ pnlFind = new PanelTester("pnlFind", CurrentWebForm);
+ last_name_list = new
DropDownListTester(App.LAST_NAME_LIST, CurrentWebForm);
+ first_name_list = new
DropDownListTester(App.FIRST_NAME_LIST, CurrentWebForm);
+ extension_list = new
DropDownListTester(App.EXTENSION_LIST, CurrentWebForm);
+ user_name_list = new
DropDownListTester(App.USER_NAME_LIST, CurrentWebForm);
+ hired_list = new DropDownListTester(App.HIRED_LIST,
CurrentWebForm);
+ hours_list = new DropDownListTester(App.HOURS_LIST,
CurrentWebForm);
// TODO: editor_list = new DropDownListTester
(App.EDITOR_LIST, CurrentWebForm);
- cmdListAll = new ButtonTester ("cmdListAll",
CurrentWebForm);
+ cmdListAll = new ButtonTester("cmdListAll",
CurrentWebForm);
- pnlList = new PanelTester ("pnlList", CurrentWebForm);
- repList = new DataGridTester ("repList",
CurrentWebForm);
- cmdAdd = new ButtonTester ("cmdAdd", CurrentWebForm);
+ pnlList = new PanelTester("pnlList", CurrentWebForm);
+ repList = new DataGridTester("repList", CurrentWebForm);
+ cmdAdd = new ButtonTester("cmdAdd", CurrentWebForm);
- Browser.GetPage
("http://localhost/PhoneBook/Forms/Directory.aspx";);
+
Browser.GetPage("http://localhost/PhoneBook/Forms/Directory.aspx";);
}
@@ -86,17 +86,17 @@
/// </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(list);
}
- WebAssert.Visible (cmdListAll);
- WebAssert.Visible (pnlList);
- WebAssert.Visible (repList);
- WebAssert.NotVisible (cmdAdd); // Visible if Editor
+ WebAssert.Visible(cmdListAll);
+ WebAssert.Visible(pnlList);
+ WebAssert.Visible(repList);
+ WebAssert.NotVisible(cmdAdd); // Visible if Editor
}
/// <summary>
@@ -104,11 +104,11 @@
/// </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/AppGridHelper.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs Sat Sep 10
12:20:36 2005
@@ -9,51 +9,52 @@
{
public class AppGridHelper : GridViewHelper
{
- public override IEntryList NewEntryList ()
+ public override IEntryList NewEntryList()
{
- return new AppEntryList ();
+ return new AppEntryList();
}
private bool _HasEditColumn = true;
+
public override bool HasEditColumn
{
get { return _HasEditColumn; }
set { _HasEditColumn = value; }
}
- public override int BindColumns (DataGrid grid, int i)
+ public override 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;
-
- if (fc.ControlTypeName.Equals ("CheckBox"))
- i = BindTemplateColumn (grid,
GetCheckBoxColumn(), i, label);
- else
- i = MyBindColumn (grid, i, label,
column);
+ if ((label == null) || (label.Length == 0))
label = column;
+
+ if (fc.ControlTypeName.Equals("CheckBox"))
+ i = BindTemplateColumn(grid,
GetCheckBoxColumn(), i, label);
+ else
+ i = MyBindColumn(grid, i, label,
column);
}
return i;
}
- protected int MyBindColumn (DataGrid grid, int pos, string
headerText, string dataField)
+ protected int MyBindColumn(DataGrid grid, int pos, string
headerText, string dataField)
{
- BoundColumn column = new BoundColumn ();
+ BoundColumn column = new BoundColumn();
column.DataField = dataField;
column.HeaderText = headerText;
- grid.Columns.AddAt (pos, column);
+ grid.Columns.AddAt(pos, column);
return pos + 1;
}
protected int BindTemplateColumn(DataGrid grid, DataGridColumn
column, int pos, string headerText)
{
- column.HeaderText = headerText;
- grid.Columns.AddAt (pos, column);
- return pos + 1;
+ column.HeaderText = headerText;
+ grid.Columns.AddAt(pos, column);
+ return pos + 1;
}
public TemplateColumn GetCheckBoxColumn()
@@ -65,11 +66,11 @@
}
- public class CheckBoxTemplate : ITemplate
- {
- public void InstantiateIn(Control container)
- {
- container.Controls.Add(new CheckBox());
- }
- }
+ public class CheckBoxTemplate : ITemplate
+ {
+ public void InstantiateIn(Control container)
+ {
+ container.Controls.Add(new CheckBox());
+ }
+ }
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/AssemblyInfo.cs Sat Sep 10
12:20: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/PhoneBook/Web/Controls/Finder.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs Sat
Sep 10 12:20:36 2005
@@ -9,7 +9,6 @@
{
public class Finder : ViewControl
{
-
protected DropDownList last_name_list;
protected DropDownList first_name_list;
protected DropDownList extension_list;
@@ -23,36 +22,36 @@
/// </summary>
public event EventHandler Click;
- private DropDownList[] FilterList ()
+ private DropDownList[] FilterList()
{
DropDownList[] lists = {last_name_list,
first_name_list, extension_list, user_name_list, hired_list, hours_list};
return lists;
}
- private void Filter_Reset (DropDownList except)
+ private void Filter_Reset(DropDownList except)
{
int exceptIndex = 0;
if (except != null) exceptIndex = except.SelectedIndex;
- foreach (DropDownList filter in FilterList ())
+ foreach (DropDownList filter in FilterList())
{
filter.SelectedIndex = 0;
}
if (except != null) except.SelectedIndex = exceptIndex;
}
- private void Filter_Changed (object sender, EventArgs e)
+ private void Filter_Changed(object sender, EventArgs e)
{
IViewHelper helper =
Catalog.GetHelperFor(App.ENTRY_LIST);
DropDownList list = sender as DropDownList;
string id = list.ID;
- int v = id.LastIndexOf (helper.ListSuffix);
- string key = id.Substring (0, v);
- helper.Criteria [key] = list.SelectedValue;
- Filter_Reset (list);
+ int v = id.LastIndexOf(helper.ListSuffix);
+ string key = id.Substring(0, v);
+ helper.Criteria[key] = list.SelectedValue;
+ Filter_Reset(list);
Click(this, new ViewArgs(helper));
}
- public void Open ()
+ public void Open()
{
IViewHelper h = this.ExecuteBind(App.DIRECTORY_VIEW);
bool ok = (h.IsNominal);
@@ -60,30 +59,31 @@
Page_Error = h;
}
- private void find_Click (object sender, EventArgs e)
+ private void find_Click(object sender, EventArgs e)
{
if (Click == null) return;
- Filter_Reset (null);
+ Filter_Reset(null);
IViewHelper helper = Read(App.DIRECTORY_VIEW);
Click(this, new ViewArgs(helper));
}
- private void Page_Load(object sender, System.EventArgs e)
+ private void Page_Load(object sender, EventArgs e)
{
find.Text = Directory.msg_LIST_ALL_CMD;
- find.Click += new EventHandler (find_Click);
+ find.Click += new EventHandler(find_Click);
- foreach (DropDownList filter in FilterList ())
+ foreach (DropDownList filter in FilterList())
{
filter.AutoPostBack = true;
- filter.SelectedIndexChanged += new EventHandler
(Filter_Changed);
+ filter.SelectedIndexChanged += new
EventHandler(Filter_Changed);
}
Open();
}
#region Web Form Designer generated code
- override protected void OnInit(EventArgs e)
+
+ protected override void OnInit(EventArgs e)
{
//
// CODEGEN: This call is required by the ASP.NET Web
Form Designer.
@@ -91,15 +91,16 @@
InitializeComponent();
base.OnInit(e);
}
-
+
/// <summary>
/// Required method for Designer support - do not
modify
/// the contents of this method with the code
editor.
/// </summary>
private void InitializeComponent()
{
- this.Load += new System.EventHandler(this.Page_Load);
+ this.Load += new EventHandler(this.Page_Load);
}
+
#endregion
}
-}
+}
\ No newline at end of file
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs Sat
Sep 10 12:20:36 2005
@@ -9,7 +9,6 @@
{
public class Lister : ViewControl
{
-
protected DataGrid list;
public void Open(IDictionary criteria)
@@ -21,18 +20,19 @@
{
IList result = helper.Outcome;
list.DataSource = result;
- list.DataBind ();
- }
+ list.DataBind();
+ }
}
- private void Page_Load(object sender, System.EventArgs e)
+ private void Page_Load(object sender, EventArgs e)
{
if (IsPostBack) return;
Open(null);
}
#region Web Form Designer generated code
- override protected void OnInit(EventArgs e)
+
+ protected override void OnInit(EventArgs e)
{
//
// CODEGEN: This call is required by the ASP.NET Web
Form Designer.
@@ -40,15 +40,16 @@
InitializeComponent();
base.OnInit(e);
}
-
+
/// <summary>
/// Required method for Designer support - do not
modify
/// the contents of this method with the code
editor.
/// </summary>
private void InitializeComponent()
{
- this.Load += new System.EventHandler(this.Page_Load);
+ this.Load += new EventHandler(this.Page_Load);
}
+
#endregion
}
-}
+}
\ 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=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs Sat
Sep 10 12:20:36 2005
@@ -74,7 +74,7 @@
private void View_Error(object sender, EventArgs e)
{
ViewArgs v = e as ViewArgs;
- if (v==null) throw new ArgumentException("View_Error:
!(e is ViewArgs)");
+ if (v == null) throw new ArgumentException("View_Error:
!(e is ViewArgs)");
IViewHelper helper = v.Helper;
if (helper != null) Page_Error = helper;
else throw new ArgumentException("View_Error:
(e.helper==null)");
@@ -86,14 +86,14 @@
c.Catalog = this.Catalog; // ISSUE: Why isn't control
injection working?
}
- protected void Page_Init ()
+ protected void Page_Init()
{
pnlError.Visible = false;
View_Init(finder);
View_Init(lister);
}
- protected void Page_Load (object sender, EventArgs e)
+ protected void Page_Load(object sender, EventArgs e)
{
// Put user code to initialize the page here
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs?rev=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs Sat
Sep 10 12:20:36 2005
@@ -15,10 +15,10 @@
///
public class Directory2 : BaseGridPage
{
-
#region Helpers
private IViewHelper _UserHelper;
+
/// <summary>
/// Obtain entry for a user.
/// </summary>
@@ -41,12 +41,13 @@
protected Label error_label;
private AppUserProfile _Profile;
+
protected AppUserProfile Profile
{
set
{
if (value == null)
- _Profile = NewProfile ();
+ _Profile = NewProfile();
else
_Profile = value;
@@ -54,18 +55,18 @@
get { return _Profile; }
}
- protected AppUserProfile NewProfile ()
+ protected AppUserProfile NewProfile()
{
- WindowsIdentity id = WindowsIdentity.GetCurrent ();
- AppUserProfile profile = new AppUserProfile (id);
- Session [UserProfile.USER_PROFILE] = profile;
+ WindowsIdentity id = WindowsIdentity.GetCurrent();
+ AppUserProfile profile = new AppUserProfile(id);
+ Session[UserProfile.USER_PROFILE] = profile;
- UserHelper.Criteria [App.USER_NAME] = profile.UserId;
- UserHelper.Execute ();
+ UserHelper.Criteria[App.USER_NAME] = profile.UserId;
+ UserHelper.Execute();
if (UserHelper.IsNominal)
{
- string editor = UserHelper.Criteria
[App.EDITOR] as string;
- bool isEditor = ((editor != null) &&
(editor.Equals ("1")));
+ string editor = UserHelper.Criteria[App.EDITOR]
as string;
+ bool isEditor = ((editor != null) &&
(editor.Equals("1")));
profile.IsEditor = isEditor;
}
@@ -117,82 +118,82 @@
// pageload events - These methods populate controls to display
- private Label[] FilterLabels ()
+ private Label[] FilterLabels()
{
- Label[] labels =
{last_name_label,first_name_label,extension_label,user_name_label,hired_label,hours_label};
+ Label[] labels = {last_name_label, first_name_label,
extension_label, user_name_label, hired_label, hours_label};
return labels;
}
- private DropDownList[] FilterList ()
+ private DropDownList[] FilterList()
{
DropDownList[] lists = {last_name_list,
first_name_list, extension_list, user_name_list, hired_list, hours_list};
return lists;
}
- private void ListAll_Click (object sender, EventArgs e)
+ private void ListAll_Click(object sender, EventArgs e)
{
- Filter_Reset (null);
- List_Load ();
+ Filter_Reset(null);
+ List_Load();
}
- protected override void Find_Init ()
+ protected override void Find_Init()
{
- base.Find_Init ();
- list_all_command.Click += new EventHandler
(ListAll_Click);
+ base.Find_Init();
+ list_all_command.Click += new
EventHandler(ListAll_Click);
list_all_command.Text = GetMessage(list_all_command.ID);
foreach (Label label in FilterLabels())
- {
+ {
label.Text = GetMessage(label.ID);
}
- foreach (DropDownList filter in FilterList ())
+ foreach (DropDownList filter in FilterList())
{
filter.AutoPostBack = true;
- filter.SelectedIndexChanged += new EventHandler
(Find_Submit);
+ filter.SelectedIndexChanged += new
EventHandler(Find_Submit);
}
}
private string GetRootID(string id)
{
- int v = id.LastIndexOf
(GridHelper.FindHelper.ListSuffix);
- string key = id.Substring (0, v);
- return key;
+ int v =
id.LastIndexOf(GridHelper.FindHelper.ListSuffix);
+ string key = id.Substring(0, v);
+ return key;
}
- private void Filter_Reset (DropDownList except)
+ private void Filter_Reset(DropDownList except)
{
// Reset filter controls
int exceptIndex = 0;
if (except != null) exceptIndex = except.SelectedIndex;
- foreach (DropDownList filter in FilterList ())
+ foreach (DropDownList filter in FilterList())
{
filter.SelectedIndex = 0;
}
if (except != null) except.SelectedIndex = exceptIndex;
// Tell everyone that we are starting over
Page_Prompt = GetMessage(App.DIRECTORY_PROMPT);
- List_ResetIndex ();
+ List_ResetIndex();
}
- protected override void Find_Submit (object sender, EventArgs e)
+ protected override void Find_Submit(object sender, EventArgs e)
{
// Don't call base: base.Find_Submit ();
DropDownList list = sender as DropDownList;
- Filter_Reset (list);
+ Filter_Reset(list);
string key = GetRootID(list.ID);
IGridViewHelper h = GridHelper;
- h.FindHelper.Criteria.Clear ();
- h.FindHelper.Criteria [key] = list.SelectedValue;
+ h.FindHelper.Criteria.Clear();
+ h.FindHelper.Criteria[key] = list.SelectedValue;
List_Criteria = GridHelper.FindHelper.Criteria;
- List_Load ();
+ List_Load();
}
- protected override void Find_Load ()
+ protected override void Find_Load()
{
- base.Find_Load ();
+ base.Find_Load();
IViewHelper h = GridHelper.FindHelper;
- h.ExecuteBind (find_panel.Controls);
+ h.ExecuteBind(find_panel.Controls);
bool ok = (h.IsNominal);
if (!ok)
Page_Error = h;
@@ -202,11 +203,11 @@
#region Page Events
- protected override void Page_Init ()
+ protected override void Page_Init()
{
- base.Page_Init ();
+ base.Page_Init();
list_panel.Visible = true; // base behavior hides
- Profile = Session [UserProfile.USER_PROFILE] as
AppUserProfile;
+ Profile = Session[UserProfile.USER_PROFILE] as
AppUserProfile;
GridHelper.HasEditColumn = Profile.IsEditor;
GridHelper.FindHelper.Profile = Profile;
GridHelper.ListHelper.Profile = Profile;
@@ -219,21 +220,20 @@
}
}
- protected override void Page_Load (object sender, EventArgs e)
+ protected override void Page_Load(object sender, EventArgs e)
{
- base.Page_Load(sender,e);
+ base.Page_Load(sender, e);
error_panel.Visible = false;
}
protected override void Page_PreRender(object sender, EventArgs
e)
{
- base.Page_PreRender(sender,e);
+ base.Page_PreRender(sender, e);
greeting.Text = GetMessage(greeting.ID);
title.InnerText = GetMessage(App.DIRECTORY_TITLE);
heading.InnerText = GetMessage(App.DIRECTORY_HEADING);
}
#endregion
-
}
}
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=280032&r1=280031&r2=280032&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Global.asax.cs Sat Sep 10
12:20: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
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
