Author: husted
Date: Mon Sep 12 11:48:23 2005
New Revision: 280391
URL: http://svn.apache.org/viewcvs?rev=280391&view=rev
Log:
OVR-21
* Complete "directory1" refactorings for user controls.
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs?rev=280391&r1=280390&r2=280391&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs Mon Sep
12 11:48:23 2005
@@ -6,16 +6,25 @@
/// <summary>
/// Remove punctuation on input and insert punctuation on output.
/// </summary>
+ /// <remarks><p>
+ /// Null input or output is passed thorugh as null.
+ /// Non-null input or output must be strings.
+ /// Output is formatted for local or long distane US telephone numbers.
+ /// Output strings that are too short or too long are passed through.
+ /// </p></remarks>
public class TelephoneProcessor : Processor
{
public override bool ConvertInput(IProcessorContext incoming)
{
- string source = incoming.Source as string;
- if (source == null) return false;
+ object source = incoming.Source;
+ if (source==null) return true;
+
+ string input = source as string;
+ if (input==null) return false;
char[] marks = {'-'};
- string[] splits = source.Split(marks);
- StringBuilder sb = new StringBuilder(source.Length);
+ string[] splits = input.Split(marks);
+ StringBuilder sb = new StringBuilder(input.Length);
foreach (string s in splits)
{
sb.Append(s);
@@ -26,23 +35,28 @@
public override bool FormatOutput(IProcessorContext outgoing)
{
+ object source = outgoing.Source;
+ if (source==null) return true;
+
+ string output = source as string;
+ if (output==null) return false;
+
string mark = "-";
- string source = outgoing.Source as string;
- if (source == null) return false;
+ if (output == null) return false;
string buffer = null;
- if (source.Length == 10)
+ if (output.Length == 10)
{
// 012-345-6789
- string buffer1 = source.Insert(6, mark);
+ string buffer1 = output.Insert(6, mark);
buffer = buffer1.Insert(3, mark);
}
- else if (source.Length == 7)
+ else if (output.Length == 7)
{
// 012-3456
- buffer = source.Insert(3, mark);
+ buffer = output.Insert(3, mark);
}
- else buffer = source;
+ else buffer = output;
outgoing.Target = buffer;
return true;
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=280391&r1=280390&r2=280391&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs Mon
Sep 12 11:48:23 2005
@@ -78,7 +78,7 @@
filter.SelectedIndexChanged += new
EventHandler(Filter_Changed);
}
- Open();
+ if (!IsPostBack) Open();
}
#region Web Form Designer generated code
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=280391&r1=280390&r2=280391&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs Mon
Sep 12 11:48:23 2005
@@ -40,7 +40,7 @@
private IRequestCatalog _Catalog;
/// <summary>
- /// Helper passed by an enclosing control (e.g. Page).
+ /// Provide reference ot the Catalog (object factory) for this
application.
/// </summary>
/// <remarks><p>
/// Subclasses adding EventHandlers
@@ -88,14 +88,13 @@
protected void Page_Init()
{
- pnlError.Visible = false;
View_Init(finder);
View_Init(lister);
}
protected void Page_Load(object sender, EventArgs e)
{
- // Put user code to initialize the page here
+ pnlError.Visible = false;
}
#endregion
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
