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 2006/03/24 06:07:21 UTC
svn commit: r388375 - in /struts/sandbox/trunk/action2/apps/mailreader/src:
java/mailreader2/ webapp/pages/
Author: husted
Date: Thu Mar 23 21:07:20 2006
New Revision: 388375
URL: http://svn.apache.org/viewcvs?rev=388375&view=rev
Log:
Action2 Apps
* Mailreader - Work in progress
** Add Subscription grid to Registration.jsp
** Draft Subscription page.
Added:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java (with props)
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp (with props)
Modified:
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration-validation.xml
struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java?rev=388375&r1=388374&r2=388375&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/ApplicationListener.java Thu Mar 23 21:07:20 2006
@@ -162,14 +162,6 @@
}
context.setAttribute(DATABASE_KEY, database);
- // Cache the selection items for protocols
- String[][] protocols = new String[][] {
- { "imap", "IMAP Protocol" },
- { "pop3", "POP3 Protocol" }
- };
-
- context.setAttribute(PROTOCOLS_KEY, protocols);
-
}
// -------------------------------------------------------- Private Methods
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java?rev=388375&r1=388374&r2=388375&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/MailreaderSupport.java Thu Mar 23 21:07:20 2006
@@ -234,5 +234,4 @@
getSession().put(Constants.SUBSCRIPTION_KEY, subscription);
}
-
}
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration-validation.xml
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration-validation.xml?rev=388375&r1=388374&r2=388375&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration-validation.xml (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Registration-validation.xml Thu Mar 23 21:07:20 2006
@@ -47,11 +47,9 @@
</field-validator>
</field>
- <!--
<validator type="expression">
<param name="expression">password eq password2</param>
<message key="error.password.match"/>
</validator>
- -->
</validators>
Added: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java?rev=388375&view=auto
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java (added)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java Thu Mar 23 21:07:20 2006
@@ -0,0 +1,59 @@
+package mailreader2;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class Subscription extends MailreaderSupport {
+
+ List types = new ArrayList();
+
+ List getTypes() {
+ return types;
+ }
+
+ public String input() {
+
+ types.add(new KeyValue("imap", "IMAP Protocol"));
+ types.add(new KeyValue("pop3", "POP3 Protocol"));
+
+ return INPUT;
+ }
+
+ public String execute() {
+
+
+ return SUCCESS;
+ }
+
+
+ public static class KeyValue {
+ String key;
+ String value;
+
+ public KeyValue(String key, String value) {
+ this.key = key;
+ this.value = value;
+ }
+
+ public String getKey() {
+ return this.key;
+ }
+
+ public String getValue() {
+ return this.value;
+ }
+
+ public boolean equals(Object obj) {
+ if (! (obj instanceof KeyValue)) {
+ return false;
+ } else {
+ return key.equals(((KeyValue) obj).getKey());
+ }
+ }
+
+ public int hashCode() {
+ return key.hashCode();
+ }
+ }
+
+}
Propchange: struts/sandbox/trunk/action2/apps/mailreader/src/java/mailreader2/Subscription.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp?rev=388375&r1=388374&r2=388375&view=diff
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp (original)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Registration.jsp Thu Mar 23 21:07:20 2006
@@ -2,9 +2,10 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head><ww:if test="task=='Create'">
- <title><ww:text name="registration.title.create"/></title>
-</ww:if>
+<head>
+ <ww:if test="task=='Create'">
+ <title><ww:text name="registration.title.create"/></title>
+ </ww:if>
<ww:if test="task=='Edit'">
<title><ww:text name="registration.title.edit"/></title>
</ww:if>
@@ -12,7 +13,7 @@
<body>
-<ww:form method="POST" validate="false">
+<ww:form method="POST" validate="true">
<ww:hidden name="task"/>
<ww:if test="task == 'Create'">
<ww:textfield label="%{getText('prompt.username')}" name="username"/>
@@ -44,6 +45,64 @@
</ww:else>
</ww:form>
+
+<ww:if test="task == 'Edit'">
+ <div align="center">
+ <h3><ww:text name="heading.subscriptions"/></h3>
+ </div>
+
+ <table border="1" width="100%">
+
+ <tr>
+ <th align="center" width="30%">
+ <ww:text name="heading.host"/>
+ </th>
+ <th align="center" width="25%">
+ <ww:text name="heading.user"/>
+ </th>
+ <th align="center" width="10%">
+ <ww:text name="heading.type"/>
+ </th>
+ <th align="center" width="10%">
+ <ww:text name="heading.autoConnect"/>
+ </th>
+ <th align="center" width="15%">
+ <ww:text name="heading.action"/>
+ </th>
+ </tr>
+
+ <ww:iterator value="user.subscriptions">
+ <tr>
+ <td align="left">
+ <ww:property value="host"/>
+ </td>
+ <td align="left">
+ <ww:property value="username"/>
+ </td>
+ <td align="center">
+ <ww:property value="type"/>
+ </td>
+ <td align="center">
+ <ww:property value="autoConnect"/>
+ </td>
+ <td align="center">
+
+ <a href="<ww:url action="Subscription!delete"><ww:param name="host" value="#host"/></ww:url>">
+ <ww:text name="registration.deleteSubscription"/>
+ </a>
+
+ <a href="<ww:url action="Subscription!edit"><ww:param name="host" value="#host"/></ww:url>">
+ <ww:text name="registration.editSubscription"/>
+ </a>
+
+ </td>
+ </tr>
+ </ww:iterator>
+
+ </table>
+
+ <ww:action name="Subscription.edit"><ww:text name="registration.addSubscription"/></ww:action>
+</ww:if>
<jsp:include page="Footer.jsp"/>
Added: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
URL: http://svn.apache.org/viewcvs/struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp?rev=388375&view=auto
==============================================================================
--- struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp (added)
+++ struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp Thu Mar 23 21:07:20 2006
@@ -0,0 +1,55 @@
+<%@ taglib uri="/webwork" prefix="ww" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<head>
+ <ww:if test="task=='Create'">
+ <title><ww:text name="subscription.title.create"/></title>
+ </ww:if>
+ <ww:if test="task=='Edit'">
+ <title><ww:text name="subscription.title.edit"/></title>
+ </ww:if>
+ <ww:if test="task=='Edit'">
+ <title><ww:text name="subscription.title.edit"/></title>
+ </ww:if>
+</head>
+
+<body>
+<ww:form method="POST" validate="true">
+ <ww:hidden name="task"/>
+ <ww:hidden name="username"/>
+
+ <ww:label label="%{getText('prompt.username')}" name="user.username"/>
+
+ <ww:if test="task == 'Create'">
+ <ww:textfield label="%{getText('prompt.mailHostname')}" name="subscription.host"/>
+ </ww:if>
+ <ww:else>
+ <ww:label label="%{getText('prompt.mailHostname')}" name="subscription.host"/>
+ <ww:hidden name="subscription.host"/>
+ </ww:else>
+
+ <ww:textfield label="%{getText('prompt.mailUsername')}" name="subscription.username"/>
+
+ <ww:textfield label="%{getText('prompt.mailPassword')}" name="subscription.password"/>
+
+ <ww:select label="%{getText('prompt.mailServerType')}" name="subscription.type"
+ list="servers"/>
+
+ <ww:checkbox label="%{getText('prompt.autoConnect')}" name="subscription.autoConnect"/>
+
+ <ww:if test="task == 'Delete'">
+ <ww:submit value="%{getText('button.confirm')}"/>
+ <ww:reset value="%{getText('button.reset')}"/>
+ </ww:if>
+ <ww:else>
+ <ww:submit value="%{getText('button.save')}"/>
+ </ww:else>
+
+ <ww:submit action="MainMenu" value="%{getText('button.cancel')}" onclick="form.onsubmit=null"/>
+</ww:form>
+
+<jsp:include page="Footer.jsp"/>
+
+</body>
+</html>
Propchange: struts/sandbox/trunk/action2/apps/mailreader/src/webapp/pages/Subscription.jsp
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@struts.apache.org
For additional commands, e-mail: dev-help@struts.apache.org