jmitchell 2003/07/26 23:39:56
Modified: contrib/struts-faces/src/example/org/apache/struts/webapp/example
LinkUserTag.java LogonAction.java
RegistrationForm.java SaveRegistrationAction.java
SaveSubscriptionAction.java
Log:
Remove bad imports and calls to deprecated methods.
Revision Changes Path
1.2 +6 -5
jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/LinkUserTag.java
Index: LinkUserTag.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/LinkUserTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LinkUserTag.java 7 Mar 2003 03:22:42 -0000 1.1
+++ LinkUserTag.java 27 Jul 2003 06:39:56 -0000 1.2
@@ -64,12 +64,13 @@
import java.io.IOException;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.PageContext;
import javax.servlet.jsp.tagext.TagSupport;
+
import org.apache.struts.util.MessageResources;
import org.apache.struts.util.ResponseUtils;
1.2 +8 -7
jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/LogonAction.java
Index: LogonAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/LogonAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LogonAction.java 7 Mar 2003 03:22:42 -0000 1.1
+++ LogonAction.java 27 Jul 2003 06:39:56 -0000 1.2
@@ -75,8 +75,9 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.util.AppException;
+
import org.apache.struts.util.MessageResources;
+import org.apache.struts.util.ModuleException;
import org.apache.commons.beanutils.PropertyUtils;
@@ -149,7 +150,7 @@
}
// Report any errors we have discovered back to the original form
- if (!errors.empty()) {
+ if (!errors.isEmpty()) {
saveErrors(request, errors);
return (mapping.getInputForward());
}
@@ -189,7 +190,7 @@
* @exception AppException if a business logic rule is violated
*/
public User getUser(UserDatabase database, String username)
- throws AppException {
+ throws ModuleException {
// Force an ArithmeticException which can be handled explicitly
if ("arithmetic".equals(username)) {
1.2 +5 -5
jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/RegistrationForm.java
Index: RegistrationForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/RegistrationForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RegistrationForm.java 7 Mar 2003 03:22:42 -0000 1.1
+++ RegistrationForm.java 27 Jul 2003 06:39:56 -0000 1.2
@@ -64,9 +64,9 @@
import javax.servlet.http.HttpServletRequest;
+
import org.apache.struts.action.ActionError;
import org.apache.struts.action.ActionErrors;
-import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.validator.ValidatorForm;
1.2 +8 -6
jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java
Index: SaveRegistrationAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/SaveRegistrationAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveRegistrationAction.java 7 Mar 2003 03:22:42 -0000 1.1
+++ SaveRegistrationAction.java 27 Jul 2003 06:39:56 -0000 1.2
@@ -65,10 +65,12 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Locale;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -200,7 +202,7 @@
}
// Report any errors we have discovered back to the original form
- if (!errors.empty()) {
+ if (!errors.isEmpty()) {
saveErrors(request, errors);
saveToken(request);
return (mapping.getInputForward());
1.2 +7 -7
jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java
Index: SaveSubscriptionAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/struts-faces/src/example/org/apache/struts/webapp/example/SaveSubscriptionAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SaveSubscriptionAction.java 7 Mar 2003 03:22:42 -0000 1.1
+++ SaveSubscriptionAction.java 27 Jul 2003 06:39:56 -0000 1.2
@@ -65,16 +65,16 @@
import java.lang.reflect.InvocationTargetException;
import java.util.Locale;
+
import javax.servlet.ServletException;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.Action;
-import org.apache.struts.action.ActionError;
-import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
