[Castore-commits] ChoixLicenceAction.java 1.1.2.1 1.1.2.2 SoumissionMDAction.java 1.2.2.1 1.2.2.2

[Stéphane Bouchet]

Update of /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/documents
In directory adullact1:/tmp/cvs-serv27443/src/java/fr/emn/castor/struts/actions/documents

Modified Files:
      Tag: v1_1_branch
	ChoixLicenceAction.java SoumissionMDAction.java 
Log Message:
correction chemains des ressources

Index: SoumissionMDAction.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/documents/SoumissionMDAction.java,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** SoumissionMDAction.java	23 Nov 2005 16:19:08 -0000	1.2.2.1
--- SoumissionMDAction.java	6 Mar 2006 12:44:04 -0000	1.2.2.2
***************
*** 73,83 ****
       */
      public ActionForward execute(
!             ActionMapping mapping, ActionForm form, HttpServletRequest request,
!             HttpServletResponse response) throws Exception {
          String submit = request.getParameter("submit");
!         String suivant = PropertiesHelper
!             .getProperty(
!                 "fr.emn.castor.struts.resources.common.messages",
!                 "button.terminer");
          SoumissionMDForm mdForm = (SoumissionMDForm) form;
          if ((submit != null) && (submit.equals(suivant))) {
--- 73,83 ----
       */
      public ActionForward execute(
!             ActionMapping mapping, ActionForm form,
!             HttpServletRequest request, HttpServletResponse response)
!             throws Exception {
          String submit = request.getParameter("submit");
!         String suivant = PropertiesHelper.getProperty(
!             "fr.emn.castor.struts.resources.common.messages",
!             "button.terminer");
          SoumissionMDForm mdForm = (SoumissionMDForm) form;
          if ((submit != null) && (submit.equals(suivant))) {
***************
*** 126,133 ****
              final ActionMapping mapping, final HttpServletRequest request) {
          ActionForward forward = mapping.findForward("error");
!         String messageAccueil = PropertiesHelper
!             .getProperty(
!                 "fr.emn.castor.documents.soumission.presentation.resources.soumission",
!                 "errors.ajout.metadatas.fail");
          request.getSession().setAttribute(
              Constants.SESSION_MESSAGE_COURANT, messageAccueil);
--- 126,132 ----
              final ActionMapping mapping, final HttpServletRequest request) {
          ActionForward forward = mapping.findForward("error");
!         String messageAccueil = PropertiesHelper.getProperty(
!             "fr.emn.castor.struts.resources.documents.soumission",
!             "errors.ajout.metadatas.fail");
          request.getSession().setAttribute(
              Constants.SESSION_MESSAGE_COURANT, messageAccueil);

Index: ChoixLicenceAction.java
===================================================================
RCS file: /cvsroot/castore/castore-struts/src/java/fr/emn/castor/struts/actions/documents/ChoixLicenceAction.java,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -d -r1.1.2.1 -r1.1.2.2
*** ChoixLicenceAction.java	23 Nov 2005 16:19:08 -0000	1.1.2.1
--- ChoixLicenceAction.java	6 Mar 2006 12:44:04 -0000	1.1.2.2
***************
*** 78,86 ****
          String choixLicenceDiffusion = PropertiesHelper
              .getProperty(
!                 "fr.emn.castor.documents.soumission.presentation.resources.soumission",
                  "button.choisirLicenceDiffusion");
          String choixLicenceCC = PropertiesHelper
              .getProperty(
!                 "fr.emn.castor.documents.soumission.presentation.resources.soumission",
                  "button.choisirLicenceCC");
          String choix = licenceForm.getLicence();
--- 78,86 ----
          String choixLicenceDiffusion = PropertiesHelper
              .getProperty(
!                 "fr.emn.castor.struts.resources.documents.soumission",
                  "button.choisirLicenceDiffusion");
          String choixLicenceCC = PropertiesHelper
              .getProperty(
!                 "fr.emn.castor.struts.resources.documents.soumission",
                  "button.choisirLicenceCC");
          String choix = licenceForm.getLicence();