Author: kcardineaud Date: 2011-08-18 18:10:03 +0200 (Thu, 18 Aug 2011) New Revision: 231 Url: http://nuiton.org/repositories/revision/scmwebeditor/231 Log: #1687 Can not edit a xml file Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java Modified: trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-18 14:26:12 UTC (rev 230) +++ trunk/src/main/java/org/nuiton/scmwebeditor/ScmWebEditorBaseAction.java 2011-08-18 16:10:03 UTC (rev 231) @@ -502,6 +502,21 @@ } } + + /** + * Recuperation des propriétés dans un fichier properties + * + * @param inStream le fichier contenant les propriétés + * @return un objet Properties contenant les propriétés du fichier + */ + public static Properties loadProperties(InputStream inStream) throws IOException , NullPointerException { + Properties properties = new Properties(); + + properties.load(inStream); + return properties; + + + } public ScmSession getScmSession() { Modified: trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java =================================================================== --- trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 14:26:12 UTC (rev 230) +++ trunk/src/main/java/org/nuiton/scmwebeditor/actions/ScmWebEditorMainAction.java 2011-08-18 16:10:03 UTC (rev 231) @@ -25,6 +25,7 @@ package org.nuiton.scmwebeditor.actions; import java.io.IOException; +import java.io.InputStream; import java.net.URL; import java.util.HashMap; import java.util.Iterator; @@ -345,10 +346,13 @@ Properties properties=null; String[] editableFiles=null; - + boolean errorReadingProperties = false; try { - properties = loadProperties("src/main/resources/scm.properties"); + InputStream inStream = getClass().getResourceAsStream("/scm.properties"); + + properties = loadProperties(inStream); + if(log.isDebugEnabled()) { log.debug("editableFiles: "+ properties.getProperty("editableFiles", "text")); @@ -359,9 +363,20 @@ if(log.isErrorEnabled()) { log.error("Can't read properties file", e ); } - editableFiles = new String[1]; - editableFiles[0] = "text"; + errorReadingProperties=true; + } catch (NullPointerException e) { + if(log.isErrorEnabled()) { + log.error("Can't read properties file", e ); + } + errorReadingProperties=true; } + + if(errorReadingProperties) { + editableFiles = new String[3]; + editableFiles[0] = "text"; + editableFiles[1] = "xml"; + editableFiles[2] = "x-java"; + } boolean editable =false;