From 6049aea754dbc34649f59fb837e79026d06c4159 Mon Sep 17 00:00:00 2001 From: Sebastian Sdorra Date: Thu, 16 Jun 2011 16:46:14 +0200 Subject: [PATCH] fix change directory in svn repositorybrowser --- .../scm/repository/SvnRepositoryBrowser.java | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryBrowser.java b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryBrowser.java index 486822761c..ef27d18713 100644 --- a/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryBrowser.java +++ b/plugins/scm-svn-plugin/src/main/java/sonia/scm/repository/SvnRepositoryBrowser.java @@ -156,10 +156,21 @@ public class SvnRepositoryBrowser implements RepositoryBrowser svnRepository.getDir(Util.nonNull(path), revisionNumber, null, (Collection) null); List children = new ArrayList(); + String basePath = Util.EMPTY_STRING; + + if (Util.isNotEmpty(path)) + { + basePath = path; + + if (!basePath.endsWith("/")) + { + basePath = basePath.concat("/"); + } + } for (SVNDirEntry entry : entries) { - children.add(createFileObject(entry)); + children.add(createFileObject(entry, basePath)); } result = new BrowserResult(); @@ -192,15 +203,16 @@ public class SvnRepositoryBrowser implements RepositoryBrowser * * * @param entry + * @param path * * @return */ - private FileObject createFileObject(SVNDirEntry entry) + private FileObject createFileObject(SVNDirEntry entry, String path) { FileObject fileObject = new FileObject(); fileObject.setName(entry.getName()); - fileObject.setPath(entry.getRelativePath()); + fileObject.setPath(path.concat(entry.getRelativePath())); fileObject.setDirectory(entry.getKind() == SVNNodeKind.DIR); if (entry.getDate() != null)