Author: husted
Date: Wed Oct 26 09:14:58 2005
New Revision: 328667
URL: http://svn.apache.org/viewcvs?rev=328667&view=rev
Log:
OVR-5
* Update code to synch with r327583
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.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
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppFields.xml
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Commands/SelectAllTest.cs Wed
Oct 26 09:14:58 2005
@@ -95,7 +95,7 @@
helper.Criteria[App.ITEM_LIMIT] = 2;
helper.Criteria[App.ITEM_OFFSET] = 4;
helper.Execute();
- if (!helper.IsNominal) Assert.Fail(helper.ErrorsText);
+ if (!helper.IsNominal) Assert.Fail(helper.AlertsText);
IList list = helper.Outcome;
Assert.IsTrue(list.Count == 2, "Expected result set to
be limited to two entries.");
AppEntry entry = list[0] as AppEntry;
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder.ascx.cs Wed
Oct 26 09:14:58 2005
@@ -30,7 +30,7 @@
IViewHelper h = this.ExecuteBind(App.ENTRY_FIND);
bool ok = (h.IsNominal);
if (!ok)
- Page_Error = h;
+ Page_Alert = h;
}
/// <summary>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx?rev=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx Wed Oct
26 09:14:58 2005
@@ -1,4 +1,5 @@
<%@ Control Language="c#" AutoEventWireup="false" Codebehind="Finder2.ascx.cs"
Inherits="PhoneBook.Web.Controls.Finder2"
TargetSchema="http://schemas.microsoft.com/intellisense/ie5"%>
+<%@ Register TagPrefix="x" Namespace="Nexus.Web" Assembly="Nexus.Web" %>
<table>
<tr>
<td colspan="6" >
@@ -7,12 +8,12 @@
</td>
</tr>
<tr>
- <td><asp:Label runat="server"
id="last_name_label"></asp:label></td>
- <td><asp:Label runat="server"
id="first_name_label"></asp:label></td>
- <td><asp:Label runat="server"
id="extension_label"></asp:Label></td>
- <td><asp:Label runat="server"
id="user_name_label"></asp:Label></td>
- <td><asp:Label runat="server" id="hired_label"></asp:Label></td>
- <td><asp:Label runat="server"
id="hours_label"></asp:Label></td>
+ <td><x:TextLabel runat="server"
id="last_name_label"></x:TextLabel></td>
+ <td><x:TextLabel runat="server"
id="first_name_label"></x:TextLabel></td>
+ <td><x:TextLabel runat="server"
id="extension_label"></x:TextLabel></td>
+ <td><x:TextLabel runat="server"
id="user_name_label"></x:TextLabel></td>
+ <td><x:TextLabel runat="server"
id="hired_label"></x:TextLabel></td>
+ <td><x:TextLabel runat="server"
id="hours_label"></x:TextLabel></td>
</tr>
<tr>
<td><asp:DropDownList ID="last_name_list"
Runat=server></asp:DropDownList></td>
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Finder2.ascx.cs Wed
Oct 26 09:14:58 2005
@@ -30,7 +30,7 @@
ExecuteBind(h);
bool ok = (h.IsNominal);
if (!ok)
- Page_Error = h;
+ Page_Alert = h;
}
/// <summary>
@@ -109,9 +109,6 @@
filter.AutoPostBack = true;
}
}
-
- if (IsPostBack) return;
- GetMessages();
}
#region Web Form Designer generated code
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister.ascx.cs Wed
Oct 26 09:14:58 2005
@@ -22,7 +22,7 @@
{
IViewHelper helper = ReadExecute(App.ENTRY_LIST,
criteria);
bool ok = helper.IsNominal;
- if (!ok) Page_Error = helper;
+ if (!ok) Page_Alert = helper;
else
{
IList result = helper.Outcome;
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Controls/Lister2.ascx.cs Wed
Oct 26 09:14:58 2005
@@ -94,8 +94,7 @@
///
private void Page_Load(object sender, EventArgs e)
{
- add.Click += new EventHandler(add_Click);
- add.Text = GetMessage(add.ID);
+ add.Click += new EventHandler(list_Add);
Grid_Load();
}
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs Wed
Oct 26 09:14:58 2005
@@ -41,7 +41,7 @@
{
set
{
- error_label.Text = value.ErrorsText;
+ error_label.Text = value.AlertsText;
error_panel.Visible = true;
}
}
@@ -124,7 +124,7 @@
///
private void View_Init(ViewControl c)
{
- c.View_Error += new EventHandler(View_Error);
+ c.View_Alert += new EventHandler(View_Error);
c.Catalog = this.Catalog; // ISSUE: Why isn't control
injection working?
}
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=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs Wed
Oct 26 09:14:58 2005
@@ -86,7 +86,7 @@
{
set
{
- error_label.Text = value.ErrorsText;
+ error_label.Text = value.AlertsText;
error_panel.Visible = true;
}
}
@@ -146,7 +146,7 @@
///
private void View_Init(ViewControl c)
{
- c.View_Error += new EventHandler(View_Error);
+ c.View_Alert += new EventHandler(View_Error);
c.Catalog = this.Catalog; // ISSUE: Why isn't control
injection working?
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppFields.xml
URL:
http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppFields.xml?rev=328667&r1=328666&r2=328667&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppFields.xml
(original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/AppFields.xml Wed
Oct 26 09:14:58 2005
@@ -5,14 +5,6 @@
<!-- 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>
@@ -68,6 +60,7 @@
<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 -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
