[Join-cvs] join1/src/main/org/figure8/join/control/action AssemblyActions.java, 1.2, 1.3 BuildActions.java, 1.1, 1.2 DeliverableActions.java, 1.2, 1.3

[Laurent B. <lbr...@us...>]

Update of /cvsroot/join/join1/src/main/org/figure8/join/control/action
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv5625/control/action

Modified Files:
	AssemblyActions.java BuildActions.java DeliverableActions.java 
Log Message:
Fix for issue #1996222 : modify navigation on duplicate exception

Index: DeliverableActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/DeliverableActions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DeliverableActions.java	8 Apr 2007 18:40:38 -0000	1.2
--- DeliverableActions.java	24 Jul 2008 23:52:23 -0000	1.3
***************
*** 258,262 ****
              // Store exception within request.
              request.setAttribute(DUPLICATE_DELIVERABLE_KEY, dee.getOriginalEntity());
!             return mapping.findForward("Delivery");
           }
  
--- 258,262 ----
              // Store exception within request.
              request.setAttribute(DUPLICATE_DELIVERABLE_KEY, dee.getOriginalEntity());
!             return showDeliverableForm(mapping, form, request, response);
           }
  

Index: BuildActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/BuildActions.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** BuildActions.java	14 Jan 2007 14:00:37 -0000	1.1
--- BuildActions.java	24 Jul 2008 23:52:23 -0000	1.2
***************
*** 227,231 ****
              // Store exception within request.
              request.setAttribute(DUPLICATE_BUILD_KEY, dee.getOriginalEntity());
!             return mapping.findForward("Form");
           }
           // Forward to list of builds for release.
--- 227,231 ----
              // Store exception within request.
              request.setAttribute(DUPLICATE_BUILD_KEY, dee.getOriginalEntity());
!             return showBuildForm(mapping, form, request, response);
           }
           // Forward to list of builds for release.

Index: AssemblyActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/AssemblyActions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** AssemblyActions.java	14 Jan 2007 14:15:05 -0000	1.2
--- AssemblyActions.java	24 Jul 2008 23:52:23 -0000	1.3
***************
*** 246,250 ****
              // Store exception within request.
              request.setAttribute(DUPLICATE_ASSEMBLY_KEY, dee.getOriginalEntity());
!             return mapping.findForward("Form");
           }
  
--- 246,250 ----
              // Store exception within request.
              request.setAttribute(DUPLICATE_ASSEMBLY_KEY, dee.getOriginalEntity());
!             return showAssemblyForm(mapping, form, request, response);
           }