Author: husted
Date: Wed Jun 29 14:18:18 2005
New Revision: 202431
URL: http://svn.apache.org/viewcvs?rev=202431&view=rev
Log:
OVR-5
* Rename file names to match class names.
* Update configuration to match Nexus changes in Struts r20249.
Added:
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntry.cs
- copied unchanged from r201704,
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryList.cs
- copied unchanged from r201703,
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppEntryListProcessor.cs
- copied unchanged from r201703,
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppProcessor.cs
Removed:
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppProcessor.cs
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj
struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Messages.resx
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/Core.csproj Wed Jun 29
14:18:18 2005
@@ -104,17 +104,17 @@
BuildAction = "Compile"
/>
<File
- RelPath = "AppContext.cs"
+ RelPath = "AppEntry.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
- RelPath = "AppContextList.cs"
+ RelPath = "AppEntryList.cs"
SubType = "Code"
BuildAction = "Compile"
/>
<File
- RelPath = "AppProcessor.cs"
+ RelPath = "AppEntryListProcessor.cs"
SubType = "Code"
BuildAction = "Compile"
/>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/BaseTest.cs Wed Jun 29
14:18:18 2005
@@ -25,7 +25,7 @@
/// </summary>
///
[TestFixture]
- public class BaseTest : BaseNexusTest
+ public class BaseTest : CatalogBaseTest
{
/// <summary>
/// Confirm that the outcome is a non-null, non-empty list.
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/AppGridHelper.cs Wed Jun 29
14:18:18 2005
@@ -1,8 +1,8 @@
using System.Web.UI;
using System.Web.UI.WebControls;
-using Nexus;
using Nexus.Core;
using Nexus.Core.Tables;
+using Nexus.Web;
using PhoneBook.Core;
namespace PhoneBook.Web
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=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs Wed
Jun 29 14:18:18 2005
@@ -137,6 +137,7 @@
protected override void Find_Init ()
{
+ base.Find_Init ();
list_all_command.Click += new EventHandler
(ListAll_Click);
list_all_command.Text = GetMessage(list_all_command.ID);
@@ -168,6 +169,7 @@
protected override void Find_Submit (object sender, EventArgs e)
{
+ // Don't call base: base.Find_Submit ();
IGridViewHelper h = GridHelper;
DropDownList list = sender as DropDownList;
string id = list.ID;
@@ -181,6 +183,7 @@
protected override void Find_Load ()
{
+ base.Find_Load ();
IViewHelper h = GridHelper.FindHelper;
h.ExecuteBind (find_panel.Controls);
bool ok = (h.IsNominal);
@@ -195,16 +198,24 @@
protected override void Page_Init ()
{
base.Page_Init ();
- list_panel.Visible = true;
- error_panel.Visible = false;
+ list_panel.Visible = true; // base behavior hides
Profile = Session [UserProfile.USER_PROFILE] as
AppUserProfile;
GridHelper.HasEditColumn = Profile.IsEditor;
+ GridHelper.FindHelper.Profile = Profile;
+ GridHelper.ListHelper.Profile = Profile;
+ GridHelper.SaveHelper.Profile = Profile;
if (!IsPostBack)
{
Page_Prompt = GetMessage(App.DIRECTORY_PROMPT);
profile_label.Text = Profile.UserId;
// UserLocale = Profile.Locale;
}
+ }
+
+ protected override void Page_Load (object sender, EventArgs e)
+ {
+ base.Page_Load(sender,e);
+ error_panel.Visible = false;
}
protected override void Page_PreRender(object sender, EventArgs
e)
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppBase.xml
Wed Jun 29 14:18:18 2005
@@ -16,7 +16,7 @@
<object id="BaseKeyValueProcessor"
type="Nexus.Core.Validators.KeyValueProcessor"/>
<!-- All child helpers must also specify singleton=false; otherwise,
Context is shared. -->
- <object id="BaseHelper" type="Nexus.Web.Helpers.WebViewHelper,
Nexus.Web" singleton="false">
+ <object id="BaseHelper" type="Nexus.Web.WebViewHelper, Nexus.Web"
singleton="false">
<property name="Catalog">
<ref object="Catalog" />
</property>
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
---
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml
(original)
+++
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/AppConfig.xml
Wed Jun 29 14:18:18 2005
@@ -15,7 +15,15 @@
</object>
<!-- FieldTable -->
-
+
+ <!-- Strict is not enabled, so we only need to list fields that
are
+ (1) used by a GridViewHelper,
+ (2) need special formatting (via a Processor),
+ (3) represent a list with fields that need a Processor
(fields listed because of (2))).
+ The default processing will apply .ToString() to any
unregistered fields,
+ and pass through any unregistered lists verbatim
+ (which is cool if all the fields on the list are
strings that don't need formatting).
+ -->
<object id="FieldTable" type="Nexus.Core.Tables.FieldTable">
<property name="AddFieldContexts">
<list>
@@ -55,12 +63,12 @@
<object id="extension" parent="BaseFieldContext">
<property name="ID"><value>extension</value></property>
- <property
name="ProcessorID"><value>TelephoneProcessor</value></property>
+ <property name="Processor"><ref
object="TelephoneProcessor"/></property>
</object>
<object id="hired" parent="BaseFieldContext">
<property name="ID"><value>hired</value></property>
- <property
name="ProcessorID"><value>DateTimeProcessor</value></property>
+ <property name="Processor"><ref
object="DateTimeProcessor"/></property>
</object>
<object id="hours" parent="BaseFieldContext">
@@ -70,21 +78,22 @@
<object id="editor" parent="BaseFieldContext">
<property name="ID"><value>editor</value></property>
</object>
+ <!-- property name="ControlTypeName"><value>CheckBox</value></property
-->
<!-- We need to "hash" the name with "_" to avoid conflict with the
filter Command -->
<object id="_entry_list" parent="BaseFieldContext">
<property name="ID"><value>entry_list</value></property>
- <property
name="ProcessorID"><value>EntryListProcessor</value></property>
+ <property name="Processor"><ref
object="EntryListProcessor"/></property>
</object>
<object id="_extension_list" parent="BaseFieldContext">
<property name="ID"><value>extension_list</value></property>
- <property
name="ProcessorID"><value>ExtensionListProcessor</value></property>
+ <property name="Processor"><ref
object="ExtensionListProcessor"/></property>
</object>
<object id="_hired_list" parent="BaseFieldContext">
<property name="ID"><value>hired_list</value></property>
- <property
name="ProcessorID"><value>HiredListProcessor</value></property>
+ <property name="Processor"><ref
object="HiredListProcessor"/></property>
</object>
<!-- "d" is .NET for "short date" -->
@@ -111,24 +120,17 @@
<property name="Key"><value>hired</value></property>
</object>
- <!-- Catalog -->
-
- <object id="Catalog" type="Nexus.Extras.Spring.Catalog"/>
-
-
-<!-- Request Processors -->
+ <!-- Request Processors -->
<object id="convert_input" type="Nexus.Core.Validators.ConvertInput">
<property name="ID"><value>ConvertInput</value></property>
- <property name="Required"><value>{0} is required.</value></property>
</object>
<object id="format_output" type="Nexus.Core.Validators.FormatOutput">
<property name="ID"><value>FormatOutput</value></property>
- <property name="Required"><value>{0} is required.</value></property>
</object>
-<!-- pre-op -->
+ <!-- pre-op -->
<object id="pre-op" parent="BaseChain">
<property name="AddCommands">
@@ -137,9 +139,8 @@
</list>
</property>
</object>
-
-<!-- post-op -->
+ <!-- post-op -->
<object id="post-op" parent="BaseChain">
<property name="AddCommands">
@@ -149,5 +150,12 @@
</property>
</object>
+ <!-- Catalog -->
+
+ <object id="Catalog" type="Nexus.Extras.Spring.Catalog">
+ <property name="PreOp"><ref object="pre-op"/></property>
+ <property name="PostOp"><ref object="post-op"/></property>
+ </object>
+
</objects>
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml
Wed Jun 29 14:18:18 2005
@@ -118,6 +118,7 @@
</property>
</object>
+ <!-- Note that the FieldSet refers to FieldContext objects
(AppField.xml) -->
<object id="directory_grid_helper" parent="BaseGridHelper" singleton="false">
<property name="FindHelper">
<ref object="directory_find_helper"/>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Messages.resx
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Messages.resx?rev=202431&r1=202430&r2=202431&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Messages.resx
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Messages.resx Wed
Jun 29 14:18:18 2005
@@ -40,27 +40,34 @@
<value>System.Resources.ResXResourceWriter,
System.Windows.Forms, Version=1.0.5000.0, Culture=neutral,
PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="greeting">
- <value>Welcome, </value>
- </data>
- <data name="directory_title">
- <value>Directory (2)</value>
- </data>
-
- <data name="directory_heading">
- <value>Directory</value>
- </data>
-
- <data name="directory_prompt">
- <value>Select a filter to display fewer entries</value>
- </data>
-
+ <!-- command labels -->
<data name="list_all_command">
<value>SHOW ALL</value>
</data>
+
+
+ <!-- field alerts -->
+
+ <data name="_alert">
+ <value>{0} is invalid.</value>
+ </data>
+
+ <data name="_required">
+ <value>{0} is required.</value>
+ </data>
+ <data name="DateTimeProcessor_alert">
+ <value>{0} must be a valid date.</value>
+ </data>
+
+ <data name="TelephoneProcessor_alert">
+ <value>{0} must be a telephone extension.</value>
+ </data>
+
+
+ <!-- field labels -->
<data name="last_name_label">
<value>Last Name</value>
@@ -90,4 +97,24 @@
<value>Editor?</value>
</data>
+
+ <!-- prompts -->
+
+ <data name="greeting">
+ <value>Welcome, </value>
+ </data>
+
+ <data name="directory_title">
+ <value>Directory (2)</value>
+ </data>
+
+ <data name="directory_heading">
+ <value>Directory</value>
+ </data>
+
+ <data name="directory_prompt">
+ <value>Select a filter to display fewer entries</value>
+ </data>
+
+
</root>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
