[Dynxform-commits] dynxform/src/java/net/sf/dynxform/container/cocoon/acting AbstractSubmitAction.java,1.1,1.2

[backer <eb...@us...>]

Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/acting
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/java/net/sf/dynxform/container/cocoon/acting

Modified Files:
	AbstractSubmitAction.java 
Log Message:
renamed spp param to guid

Index: AbstractSubmitAction.java
===================================================================
RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/acting/AbstractSubmitAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AbstractSubmitAction.java	19 Jul 2004 11:55:48 -0000	1.1
--- AbstractSubmitAction.java	12 Aug 2004 18:34:07 -0000	1.2
***************
*** 26,30 ****
  
    private static final String TARGET_FORM = "target";
!   private static final String FORM_ID = "spp";
  
  
--- 26,30 ----
  
    private static final String TARGET_FORM = "target";
!   private static final String FORM_ID = "guid";
  
  
***************
*** 40,44 ****
    public final Map act(final Redirector redirector, final SourceResolver sourceResolver, final Map objectModel, final String string, final Parameters parameters) throws Exception {
      final org.apache.cocoon.environment.Request request = ObjectModelHelper.getRequest(objectModel);
!     final String formSpp = parameters.getParameter(FORM_ID);
      final Map outputParameters = new HashMap();
      cocoonProducerFactory.setup(request);
--- 40,44 ----
    public final Map act(final Redirector redirector, final SourceResolver sourceResolver, final Map objectModel, final String string, final Parameters parameters) throws Exception {
      final org.apache.cocoon.environment.Request request = ObjectModelHelper.getRequest(objectModel);
!     final String formGuid = parameters.getParameter(FORM_ID);
      final Map outputParameters = new HashMap();
      cocoonProducerFactory.setup(request);
***************
*** 46,56 ****
  
      if (log.isDebugEnabled())
!       log.debug("Validate form \"" + formSpp + '\"');
  
!     if (!getFormManager().validateForm(formSpp)) {
        if (log.isDebugEnabled())
!         log.debug("Form \"" + formSpp + "\" data is invalid");
        RequestHelper.setReloadForm(request, true);
!       outputParameters.put(TARGET_FORM, formSpp);
        return outputParameters;
      }
--- 46,56 ----
  
      if (log.isDebugEnabled())
!       log.debug("Validate form \"" + formGuid + '\"');
  
!     if (!getFormManager().validateForm(formGuid)) {
        if (log.isDebugEnabled())
!         log.debug("Form \"" + formGuid + "\" data is invalid");
        RequestHelper.setReloadForm(request, true);
!       outputParameters.put(TARGET_FORM, formGuid);
        return outputParameters;
      }
***************
*** 62,66 ****
      final CocoonFlowController controller = (CocoonFlowController) formContext.getFlowController();
      controller.forward(null);
!     getFormManager().submitForm(formSpp);
  
      if (log.isDebugEnabled())
--- 62,66 ----
      final CocoonFlowController controller = (CocoonFlowController) formContext.getFlowController();
      controller.forward(null);
!     getFormManager().submitForm(formGuid);
  
      if (log.isDebugEnabled())
***************
*** 69,73 ****
      String targetForm = controller.getForwardedForm();
      if (targetForm == null) {
!       targetForm = formSpp;
        RequestHelper.setReloadForm(request, true);
      }
--- 69,73 ----
      String targetForm = controller.getForwardedForm();
      if (targetForm == null) {
!       targetForm = formGuid;
        RequestHelper.setReloadForm(request, true);
      }