husted 02/03/04 18:28:55
Modified: contrib/scaffold/src/framework/main/org/apache/scaffold/http
SuperForm.java SuperAction.java ResetAction.java
RemoveHelper.java RemoveAttribute.java
ModelHelper.java
Log:
Update SuperForm with value object population methods.
Revision Changes Path
1.3 +68 -1
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/SuperForm.java
Index: SuperForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/SuperForm.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SuperForm.java 22 Feb 2002 10:14:16 -0000 1.2
+++ SuperForm.java 5 Mar 2002 02:28:54 -0000 1.3
@@ -7,15 +7,19 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
+import org.apache.commons.beanutils.BeanUtils;
+
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionMapping;
+import org.apache.scaffold.lang.ChainedException;
+
/**
* Enhanced base ActionForm.
* @author Ted Husted
- * @version $Revision: 1.2 $ $Date: 2002/02/22 10:14:16 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/05 02:28:54 $
*/
// public class ScaffoldForm extends ValidatorForm {
public class SuperForm extends ActionForm {
@@ -163,6 +167,69 @@
// if (isMutable()) ...
+ }
+
+
+// --------------------------------------------------------- Public Methods
+
+
+ /**
+ * A static, empty String used by isBlank.
+ */
+ private static String EMPTY = "";
+
+
+ /**
+ * Convenience method to check for a null or empty String.
+ */
+ protected boolean isBlank(String s) {
+ return ((s==null) || (EMPTY.equals(s)));
+ }
+
+
+ /**
+ * Return map of properties for tihs bean.
+ * Base method uses <code>BeanUtils.describe</code>.
+ * Override if some properties should not be transfered
+ * this way, or a property name should be altered.
+ * @exception Throws Exception on any error.
+ */
+ public Map describe() throws Exception {
+ try {
+ return BeanUtils.describe(this);
+ } catch (Throwable t) {
+ throw new ChainedException(t);
+ }
+ }
+
+
+ /**
+ * Set properties from given object.
+ * Base method uses <code>BeanUtils.populate</code> and
+ * <code>BeanUtils.describe</code>.
+ * @exception Throws Exception on any error.
+ */
+ public void set(Object o) throws Exception {
+ try {
+ BeanUtils.populate(this,BeanUtils.describe(o));
+ } catch (Throwable t) {
+ throw new ChainedException(t);
+ }
+ }
+
+
+ /**
+ * Populate matching properties on given object.
+ * Base method uses <code>BeanUtils.populate</code> and
+ * <code>describe()</code>.
+ * @exception Throws ModelPopulateException on any error.
+ */
+ public void populate(Object o) throws Exception {
+ try {
+ BeanUtils.populate(o,describe());
+ } catch (Throwable t) {
+ throw new ChainedException(t);
+ }
}
1.3 +6 -6
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/SuperAction.java
Index: SuperAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/SuperAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SuperAction.java 22 Feb 2002 10:14:16 -0000 1.2
+++ SuperAction.java 5 Mar 2002 02:28:54 -0000 1.3
@@ -28,7 +28,7 @@
/**
* Enhanced base Action.
* @author Ted Husted
- * @version $Revision: 1.2 $ $Date: 2002/02/22 10:14:16 $
+ * @version $Revision: 1.3 $ $Date: 2002/03/05 02:28:54 $
*/
public class SuperAction extends Action {
@@ -183,7 +183,7 @@
return (new ActionForward(mapping.getInput()));
// If no input page, use error forwarding
- return mapping.findForward(Tokens.ERROR);
+ return mapping.findForward(Tokens.FAILURE);
}
@@ -292,7 +292,7 @@
ActionErrors errors
) {
- return mapping.findForward(Tokens.CONTINUE);
+ return mapping.findForward(Tokens.SUCCESS);
}
@@ -344,9 +344,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/SuperAction.java,v
1.2 2002/02/22 10:14:16 husted Exp $
- * $Revision: 1.2 $
- * $Date: 2002/02/22 10:14:16 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/SuperAction.java,v
1.3 2002/03/05 02:28:54 husted Exp $
+ * $Revision: 1.3 $
+ * $Date: 2002/03/05 02:28:54 $
*
* ====================================================================
*
1.2 +5 -5
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ResetAction.java
Index: ResetAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ResetAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ResetAction.java 24 Jan 2002 15:22:56 -0000 1.1
+++ ResetAction.java 5 Mar 2002 02:28:54 -0000 1.2
@@ -22,7 +22,7 @@
* Useful for workflow loops where bean should be
* reset, but request context not cleared.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2002/01/24 15:22:56 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/05 02:28:54 $
**/
public final class ResetAction extends Action {
@@ -41,7 +41,7 @@
throws IOException, ServletException {
form.reset(mapping, request);
- return mapping.findForward(Tokens.CONTINUE);
+ return mapping.findForward(Tokens.SUCCESS);
}
@@ -49,9 +49,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ResetAction.java,v
1.1 2002/01/24 15:22:56 husted Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/24 15:22:56 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ResetAction.java,v
1.2 2002/03/05 02:28:54 husted Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/05 02:28:54 $
*
* ====================================================================
*
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveHelper.java
Index: RemoveHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveHelper.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoveHelper.java 24 Jan 2002 15:22:56 -0000 1.1
+++ RemoveHelper.java 5 Mar 2002 02:28:54 -0000 1.2
@@ -21,7 +21,7 @@
* Useful for prototyping flow during development,
* and for creating blank forms for new input.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2002/01/24 15:22:56 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/05 02:28:54 $
*/
public final class RemoveHelper extends Action {
@@ -41,7 +41,7 @@
request.getSession().removeAttribute(
mapping.getParameter());
- return mapping.findForward(Tokens.CONTINUE);
+ return mapping.findForward(Tokens.SUCCESS);
}
@@ -49,9 +49,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveHelper.java,v
1.1 2002/01/24 15:22:56 husted Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/24 15:22:56 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveHelper.java,v
1.2 2002/03/05 02:28:54 husted Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/05 02:28:54 $
*
* ====================================================================
*
1.2 +4 -4
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveAttribute.java
Index: RemoveAttribute.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveAttribute.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RemoveAttribute.java 1 Jan 2002 13:44:04 -0000 1.1
+++ RemoveAttribute.java 5 Mar 2002 02:28:54 -0000 1.2
@@ -20,7 +20,7 @@
* Remove an object from the user's session.
* The name of the attribute is passed via the parameter property.
* @author Ted Husted
- * @version $Revision: 1.1 $ $Date: 2002/01/01 13:44:04 $
+ * @version $Revision: 1.2 $ $Date: 2002/03/05 02:28:54 $
**/
public final class RemoveAttribute extends Action {
@@ -43,7 +43,7 @@
request.getSession().removeAttribute(
mapping.getParameter());
- return mapping.findForward(Tokens.CONTINUE);
+ return mapping.findForward(Tokens.SUCCESS);
}
@@ -51,9 +51,9 @@
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveAttribute.java,v
1.1 2002/01/01 13:44:04 husted Exp $
- * $Revision: 1.1 $
- * $Date: 2002/01/01 13:44:04 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/RemoveAttribute.java,v
1.2 2002/03/05 02:28:54 husted Exp $
+ * $Revision: 1.2 $
+ * $Date: 2002/03/05 02:28:54 $
*
* ====================================================================
*
1.4 +8 -8
jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java
Index: ModelHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ModelHelper.java 1 Jan 2002 13:44:04 -0000 1.3
+++ ModelHelper.java 5 Mar 2002 02:28:54 -0000 1.4
@@ -25,7 +25,7 @@
/**
* Standard Action to manage helper objects.
* @author Ted Husted
- * @version $Revision: 1.3 $ $Date: 2002/01/01 13:44:04 $
+ * @version $Revision: 1.4 $ $Date: 2002/03/05 02:28:54 $
**/
public class ModelHelper extends BaseHelperAction {
@@ -64,7 +64,7 @@
* @exception ServletException if a servlet exception occurs
* :FIXME: is there any valid use of the response here?
**/
- protected ActionForward getContinue(
+ protected ActionForward getSuccess(
ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
@@ -73,7 +73,7 @@
) throws IOException, ServletException {
// return mapping.findForward(request.getParameter(Tokens.FORWARD));
- return mapping.findForward(Tokens.CONTINUE);
+ return mapping.findForward(Tokens.SUCCESS);
}
@@ -123,7 +123,7 @@
if (mapping.getInput()!=null)
return (new ActionForward(mapping.getInput()));
// If no input page, use error forwarding
- return (mapping.findForward(Tokens.ERROR));
+ return (mapping.findForward(Tokens.FAILURE));
}
// -- Check for confirmation message
@@ -145,16 +145,16 @@
return forward;
// -- Return forward for successful outcome
- return getContinue(mapping,form,request,response,helpers);
+ return getSuccess(mapping,form,request,response,helpers);
}
} // end ModelResultHelper
/*
- * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java,v
1.3 2002/01/01 13:44:04 husted Exp $
- * $Revision: 1.3 $
- * $Date: 2002/01/01 13:44:04 $
+ * $Header:
/home/cvs/jakarta-struts/contrib/scaffold/src/framework/main/org/apache/scaffold/http/ModelHelper.java,v
1.4 2002/03/05 02:28:54 husted Exp $
+ * $Revision: 1.4 $
+ * $Date: 2002/03/05 02:28:54 $
*
* ====================================================================
*
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
