[cvs] expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller ServletControllerRequest.java

[JCorporate Ltd]

Update of /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller
In directory jcorp2.servlets.net:/tmp/cvs-serv18816/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller

Modified Files:
	ServletControllerRequest.java 
Log Message:
make button 'state' param win out over any other 'state' param in request


Index: ServletControllerRequest.java
===================================================================
RCS file: /home/javacorp/.cvs/expresso/expresso/expresso-web/WEB-INF/src/com/jcorporate/expresso/core/controller/ServletControllerRequest.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** ServletControllerRequest.java	22 May 2004 01:20:08 -0000	1.29
--- ServletControllerRequest.java	18 Jun 2004 22:14:15 -0000	1.30
***************
*** 395,398 ****
--- 395,399 ----
          Object oneParamValue = null;
          boolean gotControllerFromButton = false;
+         boolean gotStateFromButton = false;
          Hashtable newParams = new Hashtable();
  
***************
*** 410,413 ****
--- 411,420 ----
                  // previously set from a button (xxx_params).
                  addThisParam = false;
+ 
+             } else if (oneParamName.equals("state") && gotStateFromButton) {
+ 
+                 // This is a state name, but we already have one
+                 // previously set from a button (xxx_params).
+                 addThisParam = false;
              } else if (oneParamName.endsWith("_params")) {
  
***************
*** 509,513 ****
--- 516,523 ----
                          if (paramName.equals("controller")) {
                              gotControllerFromButton = true;
+                         } else if (paramName.equals("state")) {
+                             gotStateFromButton = true;
                          }
+ 
                          if (log.isDebugEnabled()) {
                              log.debug("Parameter '" + paramName + "', value '"
***************
*** 566,571 ****
          //set up the required parameters
          ServletControllerRequest cparams = new ServletControllerRequest();
! 	cparams.setMapping( mapping );		// 5.3RC7
! 	cparams.setForm( form );		// 5.3RC7
          cparams.setParameters(null);
  
--- 576,581 ----
          //set up the required parameters
          ServletControllerRequest cparams = new ServletControllerRequest();
! 	    cparams.setMapping( mapping );
! 	    cparams.setForm( form );
          cparams.setParameters(null);
  
***************
*** 678,683 ****
          HttpSession session = request.getSession(false);
          ServletControllerRequest cparams = new ServletControllerRequest();
! 	cparams.setMapping( mapping );		// 5.3RC7
! 	cparams.setForm( form );		// 5.3RC7
          String userName = null;
          int uid = 0;
--- 688,693 ----
          HttpSession session = request.getSession(false);
          ServletControllerRequest cparams = new ServletControllerRequest();
! 	    cparams.setMapping( mapping );
! 	    cparams.setForm( form );
          String userName = null;
          int uid = 0;