This is an automated email from the git hooks/post-receive script. New commit to branch feature/GIT in repository scmwebeditor. See http://git.nuiton.org/scmwebeditor.git commit 2e5949e26bea69e065c081039efb093b02bbbe8d Author: Hugo PIGEON <hpigeon@codelutin.com> Date: Wed May 13 10:48:14 2015 +0200 Use of File.separator instead of "/" in paths to make the program more portable --- .../java/org/nuiton/scmwebeditor/git/GitConnection.java | 14 +++++++------- .../java/org/nuiton/scmwebeditor/svn/SvnConnection.java | 10 +++++----- .../org/nuiton/scmwebeditor/uiweb/SweSessionListener.java | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java index 060b6a0..2faea0b 100644 --- a/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java +++ b/swe-git/src/main/java/org/nuiton/scmwebeditor/git/GitConnection.java @@ -244,7 +244,7 @@ public class GitConnection implements ScmConnection { while (treeWalk.next()) { - String fileName = address + "/" + treeWalk.getPathString(); + String fileName = address + File.separator + treeWalk.getPathString(); if (fileName.startsWith(url) || url.startsWith(fileName)) { @@ -252,7 +252,7 @@ public class GitConnection implements ScmConnection { if (treeWalk.isSubtree()) { String pathString = treeWalk.getPathString(); - String currentDir = pathString.substring(pathString.lastIndexOf("/") + 1); + String currentDir = pathString.substring(pathString.lastIndexOf(File.separator) + 1); if (dirs.contains(currentDir)) { treeWalk.enterSubtree(); @@ -315,7 +315,7 @@ public class GitConnection implements ScmConnection { log.debug("Entering Git commit"); } - File localFile = new File(localDirectory.getAbsolutePath() + "/" + fileName); + File localFile = new File(localDirectory.getAbsolutePath() + File.separator + fileName); resultDto.setLastText(dto.getNewText()); @@ -504,7 +504,7 @@ public class GitConnection implements ScmConnection { path = dto.getUploadFileName(); } - File file = new File(localDirectory.getAbsolutePath() + "/" + path); + File file = new File(localDirectory.getAbsolutePath() + File.separator + path); try { FileUtils.copyFile(dto.getUpload(), file); @@ -648,7 +648,7 @@ public class GitConnection implements ScmConnection { } } - File fileToEdit = new File(localDirectory.getAbsolutePath() + "/" + fileName); + File fileToEdit = new File(localDirectory.getAbsolutePath() + File.separator + fileName); return fileToEdit; } @@ -740,7 +740,7 @@ public class GitConnection implements ScmConnection { hashedAddress = hashResult; } - localDirectory = new File(localReposPath + File.separator + sessionId + "/" + hashedAddress); + localDirectory = new File(localReposPath + File.separator + sessionId + File.separator + hashedAddress); CredentialsProvider credentials = null; @@ -829,7 +829,7 @@ public class GitConnection implements ScmConnection { } // Connection to the local repository - File gitFile = new File(localDirectory.getAbsolutePath() + "/.git"); + File gitFile = new File(localDirectory.getAbsolutePath() + File.separator + ".git"); FileRepositoryBuilder gitRepoBuilder = new FileRepositoryBuilder(); gitRepoBuilder.setGitDir(gitFile); gitRepo = gitRepoBuilder.build(); diff --git a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java index 459e3a9..2ea9e25 100644 --- a/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java +++ b/swe-svn/src/main/java/org/nuiton/scmwebeditor/svn/SvnConnection.java @@ -615,13 +615,13 @@ public class SvnConnection implements ScmConnection { String file = path.substring(path.lastIndexOf("/") + 1); // storing the file content to the user's local directory - File localDirectory = new File(ScmWebEditorConfig.getLocalRepositoriesPath() + "/" + sessionId); + File localDirectory = new File(ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId); if (!localDirectory.exists()) { localDirectory.mkdir(); } - String tempFileName = localDirectory.getAbsolutePath() + "/" + file; + String tempFileName = localDirectory.getAbsolutePath() + File.separator + file; File tempFile = new File(tempFileName); if(tempFile.exists()) { @@ -844,13 +844,13 @@ public class SvnConnection implements ScmConnection { public void createCheckoutdir() throws IOException { - File localDirectory = new File(ScmWebEditorConfig.getLocalRepositoriesPath() + "/" + sessionId); + File localDirectory = new File(ScmWebEditorConfig.getLocalRepositoriesPath() + File.separator + sessionId); if (!localDirectory.exists()) { localDirectory.mkdir(); } - checkoutdir = FileUtil.createTempDirectory(localDirectory.getAbsolutePath() + "/scm_", ""); + checkoutdir = FileUtil.createTempDirectory(localDirectory.getAbsolutePath() + File.separator + "scm_", ""); } @@ -911,7 +911,7 @@ public class SvnConnection implements ScmConnection { if (log.isDebugEnabled()) { log.debug("/" + (path.equals("") ? "" : path + "/") + ((SVNDirEntry) entry).getName() + "\n"); } - String fichier = address + "/" + (path.equals("") ? "" : path + "/") + ((SVNDirEntry) entry).getName(); + String fichier = address + File.separator + (path.equals("") ? "" : path + File.separator) + ((SVNDirEntry) entry).getName(); if (((SVNDirEntry) entry).getKind() == SVNNodeKind.DIR) { diff --git a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java index 4c4de02..9badeca 100644 --- a/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java +++ b/swe-ui-web/src/main/java/org/nuiton/scmwebeditor/uiweb/SweSessionListener.java @@ -30,7 +30,7 @@ public class SweSessionListener implements HttpSessionListener { String localReposPath = ScmWebEditorConfig.getLocalRepositoriesPath(); - File localDirectory = new File(localReposPath + "/" + sessionId); + File localDirectory = new File(localReposPath + File.separator + sessionId); try { FileUtils.deleteDirectory(localDirectory); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.