[Join-cvs] join1/src/main/org/figure8/join/control/action SetupActions.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-cvs6.sourceforge.net:/tmp/cvs-serv27622/control/action

Modified Files:
	SetupActions.java 
Log Message:
Fix for issue #1834746 : steps labels are now correct. Correct a translation error over -> other

Index: SetupActions.java
===================================================================
RCS file: /cvsroot/join/join1/src/main/org/figure8/join/control/action/SetupActions.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SetupActions.java	19 Feb 2007 20:56:21 -0000	1.2
--- SetupActions.java	27 Nov 2007 21:36:17 -0000	1.3
***************
*** 43,46 ****
--- 43,47 ----
  import javax.servlet.http.HttpServletRequest;
  import javax.servlet.http.HttpServletResponse;
+ 
  import java.io.InputStream;
  import java.io.IOException;
***************
*** 60,64 ****
   * @struts.action-forward name="Standard" path="/jsp/setup/setupstandard.jsp"
   * @struts.action-forward name="Dissociated" path="/jsp/setup/setupsynchro.jsp"
!  * @struts.action-forward name="OverSideAccess" path="/jsp/setup/setupoverside.jsp"
   * @struts.action-forward name="DatabaseChoice" path="/jsp/setup/setupdatabasechoice.jsp"
   * @struts.action-forward name="Database" path="/jsp/setup/setupdatabase.jsp"
--- 61,65 ----
   * @struts.action-forward name="Standard" path="/jsp/setup/setupstandard.jsp"
   * @struts.action-forward name="Dissociated" path="/jsp/setup/setupsynchro.jsp"
!  * @struts.action-forward name="OtherSideAccess" path="/jsp/setup/setupotherside.jsp"
   * @struts.action-forward name="DatabaseChoice" path="/jsp/setup/setupdatabasechoice.jsp"
   * @struts.action-forward name="Database" path="/jsp/setup/setupdatabase.jsp"
***************
*** 71,75 ****
     
     /** Get a commons logger. */
!    protected static Log log = LogUtil.getLog(SetupActions.class);
  
     /** Operation code for setting setup type */
--- 72,76 ----
     
     /** Get a commons logger. */
!    private static Log log = LogUtil.getLog(SetupActions.class);
  
     /** Operation code for setting setup type */
***************
*** 79,84 ****
     /** Operation code for setting synchronous property of installation */
     public static final String SETUP_SYNCH_OP = "setupSynch";
!    /** Operation code for setting application over side properties */
!    public static final String SETUP_OTHERSIDE_OP = "setupOverSide";
     /** Operation code for setting administrator */
     public static final String SETUP_ADMIN_OP = "setupAdmin";
--- 80,85 ----
     /** Operation code for setting synchronous property of installation */
     public static final String SETUP_SYNCH_OP = "setupSynch";
!    /** Operation code for setting application other side properties */
!    public static final String SETUP_OTHERSIDE_OP = "setupOtherSide";
     /** Operation code for setting administrator */
     public static final String SETUP_ADMIN_OP = "setupAdmin";
***************
*** 151,155 ****
     
     /**
!     *
      * @param operation String representing the operation to invoke on Action
      * @param mapping Mapping between forwards name and path for this action
--- 152,156 ----
     
     /**
!     * Execute the requested operation within action.s
      * @param operation String representing the operation to invoke on Action
      * @param mapping Mapping between forwards name and path for this action
***************
*** 158,161 ****
--- 159,163 ----
      * @param response The servlet container response wrapper
      * @return A forward to the next view to render and display
+     * @throws Exception is something wrong occurs
      */
     public ActionForward doExecute(String operation, ActionMapping mapping, ActionForm form,
***************
*** 276,280 ****
           bootstrapManager.setProperty(ApplicationConfig.SYNCH_SIDE, isSynchronousSide);
           // Forward to the page for configuring access to over side.
!          return mapping.findForward("OverSideAccess");
        }
        // This should not happen...
--- 278,282 ----
           bootstrapManager.setProperty(ApplicationConfig.SYNCH_SIDE, isSynchronousSide);
           // Forward to the page for configuring access to over side.
!          return mapping.findForward("OtherSideAccess");
        }
        // This should not happen...