This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit e364b64c6ed3d14fb47e61ab84378cfded736cf6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Oct 23 19:21:57 2015 +0200 Detects real file format when finding a file ending with .vm --- .../org/nuiton/scmwebeditor/uiweb/actions/EditAction.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java index 65ee45c..1445d4f 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/actions/EditAction.java @@ -139,7 +139,16 @@ public class EditAction extends ScmWebEditorMainAction { scmSupportsBranches = provider.supportsBranches(); scmSupportsPush = provider.supportsPush(); - format = scmConn.getFileName().substring(scmConn.getFileName().lastIndexOf(".") + 1); + String fileName = scmConn.getFileName(); + format = fileName.substring(fileName.lastIndexOf(".") + 1); + + if ("vm".equals(format)) { + + // Try to get extension before vm one + fileName = fileName.substring(0, fileName.length()-3); + format = fileName.substring(fileName.lastIndexOf(".") + 1); + + } String originalText = ""; @@ -322,7 +331,7 @@ public class EditAction extends ScmWebEditorMainAction { mimeType = null; try { - mimeType = getMimeType(originalText, scmConn.getFileName()); + mimeType = getMimeType(originalText, fileName); } catch (IOException e) { if (log.isErrorEnabled()) { log.error("Can't get MimeType, problem when reading file", e); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.