husted 2002/09/27 11:59:52
Modified: contrib/scaffold/src/java/org/apache/struts/scaffold
RemoveAttributeAction.java ProcessAction.java
BaseForm.java BaseAction.java
Log:
+ RemoveAttributeAction: Correct operation.
+ Migrate to PropertyUtils
Revision Changes Path
1.3 +12 -6
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/RemoveAttributeAction.java
Index: RemoveAttributeAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/RemoveAttributeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RemoveAttributeAction.java 16 Aug 2002 22:29:24 -0000 1.2
+++ RemoveAttributeAction.java 27 Sep 2002 18:59:52 -0000 1.3
@@ -38,7 +38,7 @@
* [parameter="application;HOURS].
* non-error state.
*
- * To indicatethat all scopes are to be checked,
+ * To indicate that all scopes are to be checked,
* specify an asterisk instead of the scope name
* [parameter="*;HOURS]. The attribute will be removed
* from <b>only</b> the first context found.
@@ -75,7 +75,7 @@
// :TODO: Add support for multiple attributes
- boolean any = ("*".equals(name));
+ boolean any = ("*".equals(scope));
if (any) {
@@ -99,14 +99,20 @@
else {
- if (Tokens.REQUEST.equals(scope))
+ if (Tokens.REQUEST.equals(scope)) {
+ bean = request.getAttribute(name);
request.removeAttribute(name);
+ }
- if (Tokens.SESSION.equals(scope))
+ if (Tokens.SESSION.equals(scope)) {
+ bean = request.getSession().getAttribute(name);
request.getSession().removeAttribute(name);
+ }
- if (Tokens.APPLICATION.equals(scope))
+ if (Tokens.APPLICATION.equals(scope)) {
+ bean = servlet.getServletContext().getAttribute(name);
servlet.getServletContext().removeAttribute(name);
+ }
} // end !any
1.4 +2 -2
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java
Index: ProcessAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/ProcessAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ProcessAction.java 12 Sep 2002 12:39:50 -0000 1.3
+++ ProcessAction.java 27 Sep 2002 18:59:52 -0000 1.4
@@ -494,7 +494,7 @@
ProcessResult result = (ProcessResult)
dataBean.execute(properties);
- // Execute business logic, using map
+ // Analyze result of business logic
checkOutcome(mapping,request,result);
} // end for
1.7 +3 -3
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java
Index: BaseForm.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseForm.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- BaseForm.java 12 Sep 2002 20:39:00 -0000 1.6
+++ BaseForm.java 27 Sep 2002 18:59:52 -0000 1.7
@@ -18,8 +18,8 @@
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionErrors;
import org.apache.struts.action.ActionMapping;
-import org.apache.struts.validator.ValidatorForm; // Struts 1.1
-// import com.wintecinc.struts.action.ValidatorForm; // Struts 1.0.x
+// import org.apache.struts.validator.ValidatorForm; // Struts 1.1
+import com.wintecinc.struts.action.ValidatorForm; // Struts 1.0.x
import org.apache.commons.scaffold.lang.ChainedException;
1.5 +3 -3
jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java
Index: BaseAction.java
===================================================================
RCS file:
/home/cvs/jakarta-struts/contrib/scaffold/src/java/org/apache/struts/scaffold/BaseAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BaseAction.java 12 Sep 2002 20:39:00 -0000 1.4
+++ BaseAction.java 27 Sep 2002 18:59:52 -0000 1.5
@@ -58,8 +58,8 @@
* @deprecated Will be removed after Struts 1.1 final ships.
*/
private final boolean isStruts_1_0() {
-// return true; // Struts 1.0.x
- return false; // Struts 1.1
+ return true; // Struts 1.0.x
+// return false; // Struts 1.1
}
// ---------------------------------------------------------------- Log
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
