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/06/24 01:02:34 UTC
svn commit: r201515 - in /struts/sandbox/trunk/overdrive/PhoneBook: Core/
Test/Resources/Command/ Web/ Web/Forms/ Web/Resources/Command/
Author: husted
Date: Thu Jun 23 16:02:33 2005
New Revision: 201515
URL: http://svn.apache.org/viewcvs?rev=201515&view=rev
Log:
OVR-5
* Implement simple print button to complete first iteration of page <<yeah!>>
* Change AppContext back to implement IContext, which will be helpful the IGridViewHelpler.
* Copy Directory as Directory2 before converting it to use an editable DataGrid (using the infamous IGridViewHelper).
Added:
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.resx
Modified:
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs
struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs
struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs
struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Web.config
struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml
struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs?rev=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContext.cs Thu Jun 23 16:02:33 2005
@@ -13,42 +13,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-using System.Collections;
+using Agility.Core;
namespace PhoneBook.Core
{
/// <summary>
- /// Adapt a properties class to use an IDictionary for storage.
+ /// Expose field attributes as public properties.
/// </summary>
///
- public class AppContext
+ public class AppContext : Context
{
- #region Constructors
-
- /// <summary>
- /// Instantiate with zero parameters.
- /// </summary>
- public AppContext ()
- {
- _Value = new Hashtable ();
- }
-
- /// <summary>
- /// Instantiate from a IDictionary.
- /// </summary>
- /// <param name="dictionary">New values for properties</param>
- public AppContext (IDictionary dictionary)
- {
- _Value = dictionary;
- }
-
- #endregion
-
- private IDictionary _Value;
- public IDictionary Value
- {
- get { return _Value; }
- }
/*
public string property
@@ -60,38 +34,38 @@
public string first_name
{
- get { return _Value [App.FIRST_NAME] as string; }
- set { _Value [App.FIRST_NAME] = value; }
+ get { return this [App.FIRST_NAME] as string; }
+ set { this [App.FIRST_NAME] = value; }
}
public string last_name
{
- get { return _Value [App.LAST_NAME] as string; }
- set { _Value [App.LAST_NAME] = value; }
+ get { return this [App.LAST_NAME] as string; }
+ set { this [App.LAST_NAME] = value; }
}
public string extension
{
- get { return _Value [App.EXTENSION] as string; }
- set { _Value [App.EXTENSION] = value; }
+ get { return this [App.EXTENSION] as string; }
+ set { this [App.EXTENSION] = value; }
}
public string user_name
{
- get { return _Value [App.USER_NAME] as string; }
- set { _Value [App.USER_NAME] = value; }
+ get { return this [App.USER_NAME] as string; }
+ set { this [App.USER_NAME] = value; }
}
public string hired
{
- get { return _Value [App.HIRED] as string; }
- set { _Value [App.HIRED] = value; }
+ get { return this [App.HIRED] as string; }
+ set { this [App.HIRED] = value; }
}
public string hours
{
- get { return _Value [App.HOURS] as string; }
- set { _Value [App.HOURS] = value; }
+ get { return this [App.HOURS] as string; }
+ set { this [App.HOURS] = value; }
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs?rev=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Core/AppContextList.cs Thu Jun 23 16:02:33 2005
@@ -1,4 +1,6 @@
using System.Collections;
+using Agility.Core;
+using Nexus.Core;
namespace PhoneBook.Core
{
@@ -6,37 +8,23 @@
/// List AppContext objects.
/// </summary>
///
- public class AppContextList : ArrayList
+ public class AppContextList : ArrayList, IContextList
{
- /// <summary>
- /// Create instance with zero parameters.
- /// </summary>
- ///
- public AppContextList ()
- {
- }
- /// <summary>
- /// Create an AppContext object for each IDictionary on a IList.
- /// </summary>
- /// <param name="dictionaries">A IList of IDictionaries with data values.</param>
- ///
- public AppContextList (IList dictionaries)
+ public IContext Insert (string key)
{
- foreach (IDictionary item in dictionaries)
- {
- Add (new AppContext (item));
- }
+ AppContext entry = new AppContext();
+ entry.last_name = key;
+ this.Insert (0,entry);
+ return entry;
}
- /// <summary>
- /// Wrap an IDictionary in an AppContext object and add it to the list.
- /// </summary>
- /// <param name="value">IDictionary to add as new entry</param>
- public void AddEntry (IDictionary value)
+ public void AddEntry(IDictionary row)
{
- AppContext entry = new AppContext (value);
- Add (entry);
+ AppContext entry = new AppContext();
+ foreach (DictionaryEntry col in row)
+ entry.Add (col.Key,col.Value);
+ Add(entry);
}
}
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml?rev=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Test/Resources/Command/Catalog.xml Thu Jun 23 16:02:33 2005
@@ -9,35 +9,47 @@
<property name="RelatedIDs">
<list>
<value>filter</value>
+ <value>last_name</value>
+ <value>first_name</value>
+ <value>extension</value>
+ <value>user_name</value>
+ <value>hired</value>
+ <value>hours</value>
</list>
</property>
- <property name="ID"><value>filter</value></property>
+ <property name="ID"><value>filter</value></property>
</object>
<!-- filter list commands -->
<object id="last_name_list" parent="BaseFilterList">
<property name="ID"><value>last_name_list</value></property>
+ <property name="RelatedIDs"><list><value>last_name_list</value></list></property>
</object>
<object id="first_name_list" parent="BaseFilterList">
<property name="ID"><value>first_name_list</value></property>
+ <property name="RelatedIDs"><list><value>first_name_list</value></list></property>
</object>
<object id="extension_list" parent="BaseFilterList">
<property name="ID"><value>extension_list</value></property>
+ <property name="RelatedIDs"><list><value>extension_list</value></list></property>
</object>
<object id="user_name_list" parent="BaseFilterList">
<property name="ID"><value>user_name_list</value></property>
+ <property name="RelatedIDs"><list><value>user_name_list</value></list></property>
</object>
<object id="hired_list" parent="BaseFilterList">
<property name="ID"><value>hired_list</value></property>
+ <property name="RelatedIDs"><list><value>hired_list</value></list></property>
</object>
<object id="hours_list" parent="BaseFilterList">
<property name="ID"><value>hours_list</value></property>
+ <property name="RelatedIDs"><list><value>hours_list</value></list></property>
</object>
@@ -47,16 +59,6 @@
<property name="ID">
<value>directory_view</value>
</property>
- <property name="RelatedIDs">
- <list>
- <value>last_name_list</value>
- <value>first_name_list</value>
- <value>extension_list</value>
- <value>user_name_list</value>
- <value>hired_list</value>
- <value>hours_list</value>
- </list>
- </property>
<property name="AddCommands">
<list>
<ref object="last_name_list" />
@@ -69,7 +71,7 @@
</property>
</object>
-
+
<!-- helpers -->
<object id="directory_view_helper" parent="BaseHelper" singleton="false">
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx?rev=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx Thu Jun 23 16:02:33 2005
@@ -27,7 +27,7 @@
<table><tr>
<td colspan="6" >
<asp:Button ID="cmdListAll" Runat="server"></asp:Button>
- <asp:Button ID="cmdPrint" Runat="server"></asp:Button>
+ <INPUT onclick="javascript:window.print();" type="button" value="PRINT" name="cmd_print" id="cmd_print"> </asp:Button>
</td>
<tr>
<td>Last Name</td>
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=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory.aspx.cs Thu Jun 23 16:02:33 2005
@@ -1,8 +1,8 @@
using System;
using System.Collections;
-using System.Web.UI;
using System.Web.UI.WebControls;
using Nexus.Core.Helpers;
+using Spring.Web.UI;
namespace PhoneBook.Web.Forms
{
@@ -15,7 +15,6 @@
#region Messages
private const string msg_ADD_CMD = "ADD NEW";
- private const string msg_PRINT_CMD = "PRINT";
private const string msg_LIST_ALL_CMD = "SHOW ALL";
#endregion
@@ -72,7 +71,6 @@
protected DropDownList hours_list;
// TODO: protected DropDownList editor_list;
protected Button cmdListAll;
- protected Button cmdPrint;
// pageload events - These methods populate controls to display
@@ -87,9 +85,6 @@
cmdListAll.Text = msg_LIST_ALL_CMD;
cmdListAll.Click += new EventHandler (ListAll_Click);
- cmdPrint.Text = msg_PRINT_CMD;
- cmdPrint.Click += new EventHandler (Print_Click);
-
foreach (DropDownList filter in FilterList ())
{
filter.AutoPostBack = true;
@@ -136,11 +131,6 @@
List_Load (FindHelper);
}
- private void Print_Click (object sender, EventArgs e)
- {
- throw new NotImplementedException ();
- }
-
#endregion
#region List
@@ -195,7 +185,7 @@
#endregion
- #region Page
+ #region Page Events
protected void Page_Init ()
{
Added: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx?rev=201515&view=auto
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx (added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx Thu Jun 23 16:02:33 2005
@@ -0,0 +1,70 @@
+<%@ Page language="c#" Codebehind="Directory2.aspx.cs" AutoEventWireup="true" Inherits="PhoneBook.Web.Forms.Directory2" %>
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" >
+<HTML>
+ <HEAD>
+ <title>PhoneBook Directory (2)</title>
+ <meta name="GENERATOR" Content="Microsoft Visual Studio .NET 7.1">
+ <meta name="CODE_LANGUAGE" Content="C#">
+ <meta name="vs_defaultClientScript" content="JavaScript">
+ <meta name="vs_targetSchema" content="http://schemas.microsoft.com/intellisense/ie5">
+ <LINK href="default.css" type="text/css" rel="stylesheet">
+ </HEAD>
+ <body>
+ <h1>PhoneBook Directory</h1>
+ <form id="frmDirectory" method="post" runat="server">
+
+ <!-- ERROR -->
+ <asp:Panel ID="pnlError" Runat="server">
+ <p><asp:Label ID="lblError" Runat="server"></asp:Label></p>
+ <hr>
+ </asp:Panel>
+
+ <!-- PROMPT -->
+ <p>Select a filter to display fewer entries.</p>
+
+ <!-- FIND -->
+ <asp:Panel ID="pnlFind" Runat="server">
+ <table><tr>
+ <td colspan="6" >
+ <asp:Button ID="cmdListAll" Runat="server"></asp:Button>
+ <INPUT onclick="javascript:window.print();" type="button" value="PRINT" name="cmd_print" id="cmd_print">
+ </td>
+ <tr>
+ <td>Last Name</td>
+ <td>First Name</td>
+ <td>Extension</td>
+ <td>User</td>
+ <td>Hire Date</td>
+ <td>Hours</td>
+ </tr><tr>
+ <td><asp:DropDownList ID="last_name_list" Runat=server></asp:DropDownList></td>
+ <td><asp:DropDownList ID="first_name_list" Runat=server></asp:DropDownList></td>
+ <td><asp:DropDownList ID="extension_list" Runat=server></asp:DropDownList></td>
+ <td><asp:DropDownList ID="user_name_list" Runat=server></asp:DropDownList></td>
+ <td><asp:DropDownList ID="hired_list" Runat=server></asp:DropDownList></td>
+ <td><asp:DropDownList ID="hours_list" Runat=server></asp:DropDownList></td>
+ </tr></table>
+ </asp:panel>
+
+ <!-- LIST -->
+ <asp:Panel ID="pnlList" Runat="server">
+ <asp:DataGrid id="repList" Runat="server"
+ PagerStyle-Mode="NumericPages" AllowPaging="true" PageSize="10" AutoGenerateColumns=False>
+ <HeaderStyle CssClass="HeaderStyle" BackColor="#CCCC99"></HeaderStyle>
+ <AlternatingItemStyle CssClass="AlternatingItemStyle" BackColor="#CCCC99"></AlternatingItemStyle>
+ <EditItemStyle CssClass="EditItemStyle"></EditItemStyle>
+ <Columns>
+ <asp:BoundColumn DataField="last_name" HeaderText="LAST NAME"></asp:BoundColumn>
+ <asp:BoundColumn DataField="first_name" HeaderText="FIRST NAME"></asp:BoundColumn>
+ <asp:BoundColumn DataField="extension" HeaderText="EXTENSION"></asp:BoundColumn>
+ <asp:BoundColumn DataField="user_name" HeaderText="USER"></asp:BoundColumn>
+ <asp:BoundColumn DataField="hired" HeaderText="HIRE DATE"></asp:BoundColumn>
+ <asp:BoundColumn DataField="hours" HeaderText="HOURS"></asp:BoundColumn>
+ </Columns>
+ </asp:DataGrid>
+ <p><asp:Button ID="cmdAdd" Runat="server"></asp:Button></p>
+ </asp:Panel>
+
+ </form>
+ </body>
+</HTML>
Added: 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=201515&view=auto
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs (added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.cs Thu Jun 23 16:02:33 2005
@@ -0,0 +1,208 @@
+using System;
+using System.Collections;
+using System.Web.UI.WebControls;
+using Nexus.Core.Helpers;
+using Nexus.Web;
+
+namespace PhoneBook.Web.Forms
+{
+ /// <summary>
+ /// Maintain a list of employees with their telephone extension [OVR-5].
+ /// </summary>
+ ///
+ public class Directory2 : BaseGridPage
+ {
+ #region Messages
+
+ private const string msg_ADD_CMD = "ADD NEW";
+ private const string msg_LIST_ALL_CMD = "SHOW ALL";
+
+ #endregion
+
+ #region Page Properties
+
+ protected Panel pnlError;
+ protected Label lblError;
+
+ /// <summary>
+ /// Display a list of error mesasges.
+ /// </summary>
+ public IViewHelper Page_Error
+ {
+ set
+ {
+ lblError.Text = value.ErrorsText;
+ pnlError.Visible = true;
+ }
+ }
+
+ #endregion
+
+ #region Helpers
+
+ private IViewHelper _ViewHelper;
+ /// <summary>
+ /// Obtain dynamic data for the default view.
+ /// </summary>
+ ///
+ public virtual IViewHelper ViewHelper
+ {
+ get { return _ViewHelper; }
+ set { _ViewHelper = value; }
+ }
+
+ private IViewHelper _FindHelper;
+ public virtual IViewHelper FindHelper
+ {
+ get { return _FindHelper; }
+ set { _FindHelper = value; }
+ }
+
+ #endregion
+
+ #region Find
+
+ protected Panel pnlFind;
+ protected DropDownList last_name_list;
+ protected DropDownList first_name_list;
+ protected DropDownList extension_list;
+ protected DropDownList user_name_list;
+ protected DropDownList hired_list;
+ protected DropDownList hours_list;
+ // TODO: protected DropDownList editor_list;
+ protected Button cmdListAll;
+
+ // pageload events - These methods populate controls to display
+
+ private DropDownList[] FilterList ()
+ {
+ DropDownList[] lists = {last_name_list, first_name_list, extension_list, user_name_list, hired_list, hours_list};
+ return lists;
+ }
+
+ private void Find_Init ()
+ {
+ cmdListAll.Text = msg_LIST_ALL_CMD;
+ cmdListAll.Click += new EventHandler (ListAll_Click);
+
+ foreach (DropDownList filter in FilterList ())
+ {
+ filter.AutoPostBack = true;
+ filter.SelectedIndexChanged += new EventHandler (Filter_Changed);
+ }
+ }
+
+ private void Filter_Reset (DropDownList except)
+ {
+ int exceptIndex = 0;
+ if (except != null) exceptIndex = except.SelectedIndex;
+ foreach (DropDownList filter in FilterList ())
+ {
+ filter.SelectedIndex = 0;
+ }
+ if (except != null) except.SelectedIndex = exceptIndex;
+ }
+
+ private void Filter_Changed (object sender, EventArgs e)
+ {
+ DropDownList list = sender as DropDownList;
+ string id = list.ID;
+ int v = id.LastIndexOf (FindHelper.ListSuffix);
+ string key = id.Substring (0, v);
+ FindHelper.Criteria [key] = list.SelectedValue;
+ Filter_Reset (list);
+ List_Load (FindHelper);
+ }
+
+ private void Find_Load ()
+ {
+ IViewHelper h = ViewHelper;
+ h.ExecuteBind (pnlFind.Controls);
+ bool ok = (h.IsNominal);
+ if (!ok)
+ Page_Error = h;
+ }
+
+ // postback events - These events respond to user input (to controls displayed by pageload methods)
+
+ private void ListAll_Click (object sender, EventArgs e)
+ {
+ Filter_Reset (null);
+ List_Load (FindHelper);
+ }
+
+ #endregion
+
+ #region List
+
+ protected Panel pnlList;
+ protected DataGrid repList;
+ protected Button cmdAdd;
+
+ // pageload events
+
+ private void List_Init ()
+ {
+ this.cmdAdd.Text = msg_ADD_CMD;
+ this.cmdAdd.Visible = false; // TODO: True if user is editor
+ }
+
+ private void List_Load (IViewHelper helper)
+ {
+ helper.Execute ();
+ bool ok = helper.IsNominal;
+ if (!ok) Page_Error = helper;
+ else
+ {
+ IList result = helper.Outcome;
+ repList.DataSource = result;
+ repList.DataBind ();
+ }
+ }
+
+ // postback events
+
+ protected void List_ItemCommand (object source, DataGridCommandEventArgs e)
+ {
+ bool okay = false;
+ switch (e.CommandName)
+ {
+ case "Page":
+ // Handled by List_PageIndexChanged
+ break;
+ default:
+ throw new NotImplementedException ();
+ }
+
+ if (okay) pnlList.Visible = false;
+ }
+
+ protected void List_PageIndexChanged (object sender, DataGridPageChangedEventArgs e)
+ {
+ repList.CurrentPageIndex = e.NewPageIndex;
+ repList.DataBind ();
+ }
+
+ #endregion
+
+ #region Page Events
+
+ protected void Page_Init ()
+ {
+ pnlError.Visible = false;
+ Find_Init ();
+ List_Init ();
+ }
+
+ protected void Page_Load (object sender, EventArgs e)
+ {
+ if (!IsPostBack)
+ {
+ Find_Load ();
+ List_Load (FindHelper);
+ }
+ }
+
+ #endregion
+ }
+}
\ No newline at end of file
Added: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.resx
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.resx?rev=201515&view=auto
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.resx (added)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Directory2.aspx.resx Thu Jun 23 16:02:33 2005
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<root>
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="ResMimeType">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="Version">
+ <value>1.0.0.0</value>
+ </resheader>
+ <resheader name="Reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="Writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Web.config
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Web.config?rev=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Web.config (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Forms/Web.config Thu Jun 23 16:02:33 2005
@@ -20,6 +20,11 @@
<property name="FindHelper"><ref object="directory_find_helper"/></property>
</object>
+ <object id="Directory2" type="Directory2.aspx">
+ <property name="ViewHelper"><ref object="directory_view_helper"/></property>
+ <property name="FindHelper"><ref object="directory_find_helper"/></property>
+ </object>
+
</objects>
</spring>
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=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Resources/Command/Catalog.xml Thu Jun 23 16:02:33 2005
@@ -17,33 +17,39 @@
<value>hours</value>
</list>
</property>
- <property name="ID"><value>filter</value></property>
+ <property name="ID"><value>filter</value></property>
</object>
<!-- filter list commands -->
<object id="last_name_list" parent="BaseFilterList">
<property name="ID"><value>last_name_list</value></property>
+ <property name="RelatedIDs"><list><value>last_name_list</value></list></property>
</object>
<object id="first_name_list" parent="BaseFilterList">
<property name="ID"><value>first_name_list</value></property>
+ <property name="RelatedIDs"><list><value>first_name_list</value></list></property>
</object>
<object id="extension_list" parent="BaseFilterList">
<property name="ID"><value>extension_list</value></property>
+ <property name="RelatedIDs"><list><value>extension_list</value></list></property>
</object>
<object id="user_name_list" parent="BaseFilterList">
<property name="ID"><value>user_name_list</value></property>
+ <property name="RelatedIDs"><list><value>user_name_list</value></list></property>
</object>
<object id="hired_list" parent="BaseFilterList">
<property name="ID"><value>hired_list</value></property>
+ <property name="RelatedIDs"><list><value>hired_list</value></list></property>
</object>
<object id="hours_list" parent="BaseFilterList">
<property name="ID"><value>hours_list</value></property>
+ <property name="RelatedIDs"><list><value>hours_list</value></list></property>
</object>
@@ -53,16 +59,6 @@
<property name="ID">
<value>directory_view</value>
</property>
- <property name="RelatedIDs">
- <list>
- <value>last_name_list</value>
- <value>first_name_list</value>
- <value>extension_list</value>
- <value>user_name_list</value>
- <value>hired_list</value>
- <value>hours_list</value>
- </list>
- </property>
<property name="AddCommands">
<list>
<ref object="last_name_list" />
@@ -75,7 +71,7 @@
</property>
</object>
-
+
<!-- helpers -->
<object id="directory_view_helper" parent="BaseHelper" singleton="false">
Modified: struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj?rev=201515&r1=201514&r2=201515&view=diff
==============================================================================
--- struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj (original)
+++ struts/sandbox/trunk/overdrive/PhoneBook/Web/Web.csproj Thu Jun 23 16:02:33 2005
@@ -214,6 +214,22 @@
BuildAction = "EmbeddedResource"
/>
<File
+ RelPath = "Forms\Directory2.aspx"
+ SubType = "Form"
+ BuildAction = "Content"
+ />
+ <File
+ RelPath = "Forms\Directory2.aspx.cs"
+ DependentUpon = "Directory2.aspx"
+ SubType = "Code"
+ BuildAction = "Compile"
+ />
+ <File
+ RelPath = "Forms\Directory2.aspx.resx"
+ DependentUpon = "Directory2.aspx.cs"
+ BuildAction = "EmbeddedResource"
+ />
+ <File
RelPath = "Forms\Web.config"
BuildAction = "Content"
/>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org