Author: kcardineaud Date: 2011-07-25 10:42:29 +0200 (Mon, 25 Jul 2011) New Revision: 186 Url: http://nuiton.org/repositories/revision/scmwebeditor/186 Log: Fix an issue with Exception when reading scm.properties file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-07-25 08:42:29 UTC (rev 186) @@ -302,7 +302,7 @@ * @param file le fichier contenant les propriétés * @return un objet Properties contenant les propriétés du fichier */ - public static Properties loadProperties(String file) throws IOException, FileNotFoundException{ + public static Properties loadProperties(String file) throws IOException { Properties properties = new Properties(); FileInputStream input = new FileInputStream(file); Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-07-25 08:42:29 UTC (rev 186) @@ -1,6 +1,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.ByteArrayOutputStream; +import java.io.IOException; import java.util.Properties; @@ -272,22 +273,23 @@ Properties properties=null; String[] editableFiles=null; - try{ - // chargement des propriétés - properties = loadProperties("src/main/resources/scm.properties"); - if(log.isDebugEnabled()) { - log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); - } - editableFiles=properties.getProperty("editableFiles").split(","); - } - catch(Exception e){ - if(log.isErrorEnabled()) { - log.error("Can't read properties file", e ); - editableFiles = new String[1]; - editableFiles[0] = "text"; - - } - } + + + try { + properties = loadProperties("src/main/resources/scm.properties"); + + if(log.isDebugEnabled()) { + log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); + } + editableFiles=properties.getProperty("editableFiles", "text").split(","); + + } catch (IOException e) { + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + } + editableFiles = new String[1]; + editableFiles[0] = "text"; + } boolean editable =false; Modified: trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties =================================================================== --- trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:02:49 UTC (rev 185) +++ trunk/src/main/resources/i18n/scmwebeditor_fr_FR.properties 2011-07-25 08:42:29 UTC (rev 186) @@ -30,7 +30,7 @@ scm.reset=Reinitialiser scm.resetTitle=Retour a la derniere revision du fichier scm.saveAndContinue=Sauvegarder et continuer -scm.saveAndContinueTitle=Enregister les modifications sur le depot et continer d''editer le fichier +scm.saveAndContinueTitle=Enregister les modifications sur le depot et continuer d''editer le fichier scm.saveAndQuit=Sauvegarder et quitter scm.saveAndQuitTitle=Sauvegarder le fichier sur le depot et retourner à la page precedente. scm.text=Texte