[cvs] expresso commit by rauld: changed transitionning to previous
state when
JCorporate Ltd
jcorp at jcorp2.servlets.net
Sat Dec 4 02:19:12 PST 2004
Log Message:
-----------
changed transitionning to previous state when validation fails to use the internal transition() method
Modified Files:
--------------
expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller:
Controller.java
Revision Data
-------------
Index: Controller.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java,v
retrieving revision 1.105
retrieving revision 1.106
diff -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -Lexpresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java -u -r1.105 -r1.106
--- expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
+++ expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/Controller.java
@@ -1649,11 +1649,7 @@
queuedResponse.saveErrors(actionErrors);
} else {
/** @todo if not transition to the new controller *RD* Mon Jul 27 2004 */
- /** @todo I guess there must be a cleaner way to do this *RD* Mon Jul 27 2004 */
- Transition t = new Transition();
- t.setState(StringUtil.notNull(previousState));
- t.setControllerObject(StringUtil.notNull(previousController));
- t.transition(queuedRequest, new ControllerResponse());
+ transition(StringUtil.notNull(previousState),Class.forName(StringUtil.notNull(previousController)),queuedRequest, new ControllerResponse());
}
}
@@ -1978,11 +1974,7 @@
res.saveErrors(actionErrors);
} else {
/** @todo if not transition to the new controller *RD* Mon Jul 27 2004 */
- /** @todo I guess there must be a cleaner way to do this *RD* Mon Jul 27 2004 */
- Transition t = new Transition();
- t.setState(StringUtil.notNull(previousState));
- t.setControllerObject(StringUtil.notNull(previousController));
- t.transition(req, new ControllerResponse());
+ transition(StringUtil.notNull(previousState),Class.forName(StringUtil.notNull(previousController)),req, new ControllerResponse());
}
}
/** @todo end addition *RD* Mon Jul 27 2004 */
More information about the cvs
mailing list