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/13 22:30:43 UTC
svn commit: r280646 - in /struts/sandbox/trunk/overdrive/PhoneBook: Core/
Web/Controls/ Web/Forms/
Author: husted
Date: Tue Sep 13 13:30:33 2005
New Revision: 280646
URL: http://svn.apache.org/viewcvs?rev=280646&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/TelephoneProcessor.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/AppGridControl.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.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=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/App.cs Tue Sep 13 13:30:33 2005
@@ -134,7 +134,7 @@
/// </summary>
///
public const string ENTRY_SAVE = "entry_save";
-
+
#endregion
#region Messages
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs?rev=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/TelephoneProcessor.cs Tue Sep 13 13:30:33 2005
@@ -17,10 +17,10 @@
public override bool ConvertInput(IProcessorContext incoming)
{
object source = incoming.Source;
- if (source==null) return true;
-
+ if (source == null) return true;
+
string input = source as string;
- if (input==null) return false;
+ if (input == null) return false;
char[] marks = {'-'};
string[] splits = input.Split(marks);
@@ -36,10 +36,10 @@
public override bool FormatOutput(IProcessorContext outgoing)
{
object source = outgoing.Source;
- if (source==null) return true;
+ if (source == null) return true;
string output = source as string;
- if (output==null) return false;
+ if (output == null) return false;
string mark = "-";
if (output == null) return false;
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/AppGridControl.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/AppGridControl.ascx.cs?rev=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/AppGridControl.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/AppGridControl.ascx.cs Tue Sep 13 13:30:33 2005
@@ -7,19 +7,19 @@
{
public class AppGridControl : GridControl
{
-
public override IEntryList NewContextList
{
get { return new AppEntryList(); }
}
- private void Page_Load(object sender, System.EventArgs e)
+ private void Page_Load(object sender, EventArgs e)
{
// Put user code to initialize the page here
}
#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.
@@ -27,15 +27,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/Finder2.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs?rev=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs Tue Sep 13 13:30:33 2005
@@ -6,10 +6,8 @@
namespace PhoneBook.Web.Controls
{
-
public class Finder2 : ViewControl
{
-
public Label last_name_label;
public Label first_name_label;
public Label extension_label;
@@ -23,7 +21,7 @@
protected DropDownList user_name_list;
protected DropDownList hired_list;
protected DropDownList hours_list;
-
+
protected Button find;
/// <summary>
@@ -85,7 +83,7 @@
Page_Error = h;
}
- private void Page_Load(object sender, System.EventArgs e)
+ private void Page_Load(object sender, EventArgs e)
{
find.Click += new EventHandler(find_Click);
foreach (DropDownList filter in FilterList())
@@ -98,7 +96,7 @@
foreach (Label label in FilterLabels())
{
label.Text = GetMessage(label.ID);
- }
+ }
foreach (DropDownList filter in FilterList())
{
filter.AutoPostBack = true;
@@ -107,7 +105,8 @@
}
#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.
@@ -115,15 +114,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/Lister2.ascx.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs?rev=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs Tue Sep 13 13:30:33 2005
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Web.UI.WebControls;
using Nexus.Core.Helpers;
@@ -6,11 +7,8 @@
namespace PhoneBook.Web.Controls
{
- using System;
-
public class Lister2 : AppGridControl
{
-
protected DataGrid list;
protected Button add;
@@ -51,22 +49,22 @@
DataFields = f;
IList k = new ArrayList(7);
- k.Add(GetMessage(App.LAST_NAME + LABEL));
+ k.Add(GetMessage(App.LAST_NAME + LABEL));
k.Add(GetMessage(App.FIRST_NAME + LABEL));
- k.Add(GetMessage(App.EXTENSION + LABEL));
- k.Add(GetMessage(App.USER_NAME + LABEL));
- k.Add(GetMessage(App.HIRED + LABEL));
- k.Add(GetMessage(App.HOURS + LABEL));
- k.Add(GetMessage(App.EDITOR + LABEL));
+ k.Add(GetMessage(App.EXTENSION + LABEL));
+ k.Add(GetMessage(App.USER_NAME + LABEL));
+ k.Add(GetMessage(App.HIRED + LABEL));
+ k.Add(GetMessage(App.HOURS + LABEL));
+ k.Add(GetMessage(App.EDITOR + LABEL));
DataLabels = k;
}
private void Page_Init()
{
- Grid = list;
+ Grid = list;
}
- private void Page_Load(object sender, System.EventArgs e)
+ private void Page_Load(object sender, EventArgs e)
{
SetProperties();
add.Click += new EventHandler(list_Add);
@@ -74,7 +72,8 @@
}
#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.
@@ -83,7 +82,7 @@
base.OnInit(e);
Page_Init();
}
-
+
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
@@ -95,4 +94,4 @@
#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=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs Tue Sep 13 13:30:33 2005
@@ -100,7 +100,8 @@
#endregion
#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.
@@ -109,15 +110,16 @@
base.OnInit(e);
Page_Init();
}
-
+
/// <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
- }
+ }
}
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=280646&r1=280645&r2=280646&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs Tue Sep 13 13:30:33 2005
@@ -18,7 +18,6 @@
///
public class Directory2 : Page
{
-
#region Page Properties
protected HtmlGenericControl title;
@@ -29,6 +28,7 @@
protected Label error_label;
private AppUserProfile _Profile;
+
/// <summary>
/// Obtain a profile for a user.
/// </summary>
@@ -171,7 +171,8 @@
#endregion
#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.
@@ -180,17 +181,17 @@
base.OnInit(e);
Page_Init();
}
-
+
/// <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.PreRender += new System.EventHandler(this.Page_PreRender);
+ this.Load += new EventHandler(this.Page_Load);
+ this.PreRender += new EventHandler(this.Page_PreRender);
}
+
#endregion
-
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org